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

Some code simplification

This commit is contained in:
Olivier Berten 2013-03-20 18:26:20 +01:00
parent 7ea1b10331
commit d59e32326a
13 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
booklets.php
View File

@ -5,7 +5,7 @@ $title = 'Booklets';
include('include/header.php');
echo "<h2>$title</h2>\n";
$sql1 = 'SELECT * FROM '.$db['booklets'].' ORDER BY filename';
$sql1 = 'SELECT * FROM '.db('booklets').' ORDER BY filename';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
echo "<ul class=\"incipit\">\n";

6
changes.php
View File

@ -6,15 +6,15 @@ $title = 'Changesets';
include('include/header.php');
echo "<h2>$title</h2>\n";
$sql1 = 'SELECT * FROM '.$db['changesets'].' WHERE time > 1357000000 ORDER BY time DESC';
$sql1 = 'SELECT * FROM '.db('changesets').' WHERE time > 1357000000 ORDER BY time DESC';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
while($m = $req1->fetch_assoc()) {
echo "<h4>".date("M d, Y",$m['time'])." (".username_from_id($m['user_id']).")</h4>\n";
echo "<p>".$m['comment']."</p>\n";
$sql3 = 'SELECT * FROM '.$db['chants'].' WHERE id = '.$m['chant_id'];
$sql3 = 'SELECT * FROM '.db('chants').' WHERE id = '.$m['chant_id'];
$req3 = $mysqli->query($sql3) or die('Erreur SQL !<br />'.$sql3.'<br />'.$mysqli->error);
$c = $req3->fetch_assoc();
$sql2 = 'SELECT * FROM '.$db['changes'].' WHERE changeset = "'.$m['user_id'].'|'.$m['chant_id'].'|'.$m['time'].'" ORDER BY field';
$sql2 = 'SELECT * FROM '.db('changes').' WHERE changeset = "'.$m['user_id'].'|'.$m['chant_id'].'|'.$m['time'].'" ORDER BY field';
$req2 = $mysqli->query($sql2) or die('Erreur SQL !<br />'.$sql2.'<br />'.$mysqli->error);
while($f = $req2->fetch_assoc()) {
echo '<p><i>'.$f['field']."</i><br />\n";

23
chant.php
View File

@ -8,7 +8,7 @@ if(array_key_exists("id", $_GET)) {
} else {
die('No id');
}
$sql1 = 'SELECT * FROM '.$db['chants'].' WHERE id = '.$id;
$sql1 = 'SELECT * FROM '.db('chants').' WHERE id = '.$id;
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
$c = $req1->fetch_assoc();
if(!$c) {
@ -19,11 +19,11 @@ $title = $c['incipit'];
include('include/header.php');
if(isset($_POST['proofread']) && $_POST['proofread'] == 'Me' && $c) {
$mysqli->query('INSERT into '.$db['proofreading'].' VALUES ('.$id.','.$current_user->ID.','.time().')') or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
$mysqli->query('INSERT into '.db('proofreading').' VALUES ('.$id.','.$current_user->ID.','.time().')') or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
}
$c_p = array();
$sql1 = 'SELECT * FROM '.$db['chant_sources'].' WHERE chant_id = '.$id.' ORDER BY source';
$sql1 = 'SELECT * FROM '.db('chant_sources').' WHERE chant_id = '.$id.' ORDER BY source';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
while ($s = $req1->fetch_assoc()) {
$c_s = array($s['source'], $s['page']);
@ -80,7 +80,7 @@ if(count($c_p) > 0) {
echo "</ul>\n";
}
$sql1 = 'SELECT * FROM '.$db['proofreading'].' WHERE chant_id = '.$c['id'].' ORDER BY time DESC';
$sql1 = 'SELECT * FROM '.db('proofreading').' WHERE chant_id = '.$c['id'].' ORDER BY time DESC';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
$proof = array();
$proof_done = False;
@ -117,19 +117,18 @@ if(is_string($content)) {
}
echo "</ul></li>\n";
}
echo '<li><a href="download.php?id='.$c['id'].'&amp;format=pdf">PDF</a></li>'."\n";
echo '<li><a href="download.php?id='.$c['id'].'&amp;format=eps">EPS</a></li>'."\n";
echo '<li><a href="download.php?id='.$c['id'].'&amp;format=png">PNG</a></li>'."\n";
foreach(array('pdf','eps','png') as $a) {
echo '<li><a href="download.php?id='.$c['id'].'&amp;format='.$a.'">'.strtoupper($a).'</a></li>'."\n";
}
echo "</ul>\n";
if($c['gabc_verses'] || $c['tex_verses']){
echo "<ul>\n";
echo '<li><a href="download.php?id='.$c['id'].'&amp;format=gabc&amp;1verse=1">GABC (1st verse)</a></li>'."\n";
echo '<li><a href="download.php?id='.$c['id'].'&amp;format=pdf&amp;1verse=1">PDF (1st verse)</a></li>'."\n";
echo '<li><a href="download.php?id='.$c['id'].'&amp;format=eps&amp;1verse=1">EPS (1st verse)</a></li>'."\n";
echo '<li><a href="download.php?id='.$c['id'].'&amp;format=png&amp;1verse=1">PNG (1st verse)</a></li>'."\n";
foreach(array('gabc','pdf','eps','png') as $a) {
echo '<li><a href="download.php?id='.$c['id'].'&amp;format='.$a.'&amp;1verse=1">'.strtoupper($a).' (1st verse only)</a></li>'."\n";
}
echo "</ul>\n";
}
$sql1 = 'SELECT * FROM '.$db['changesets'].' WHERE chant_id = '.$c['id'].' ORDER BY time DESC';
$sql1 = 'SELECT * FROM '.db('changesets').' WHERE chant_id = '.$c['id'].' ORDER BY time DESC';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
if($req1->num_rows > 0 || $c['transcriber'] > '') {
echo "<h4>History</h4>\n<ul>\n";

6
chant_edit.php
View File

@ -8,7 +8,7 @@ if(array_key_exists("id", $_GET)) {
} else {
die('No id');
}
$sql1 = 'SELECT * FROM '.$db['chants'].' WHERE id = '.$id;
$sql1 = 'SELECT * FROM '.db('chants').' WHERE id = '.$id;
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
$c = $req1->fetch_assoc();
if(!$c) {
@ -21,11 +21,11 @@ include('include/header.php');
if(!$logged_in) {
echo "Please login";
} elseif(count($_POST) > 0) {
#$mysqli->query('INSERT into '.$db['proofreading'].' VALUES ('.$id.','.$_SESSION['user_id'].','.time().')') or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
#$mysqli->query('INSERT into '.db('proofreading').' VALUES ('.$id.','.$_SESSION['user_id'].','.time().')') or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
} else {
$c_p = array();
$sql1 = 'SELECT * FROM '.$db['chant_sources'].' WHERE chant_id = '.$id;
$sql1 = 'SELECT * FROM '.db('chant_sources').' WHERE chant_id = '.$id;
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
while ($s = $req1->fetch_assoc()) {
$c_s = array($s['source'], $s['page']);

4
download.php
View File

@ -15,7 +15,7 @@ if(array_key_exists('1verse', $_GET) && $_GET['1verse'] == '1') {
$suffix = "";
}
$sql1 = 'SELECT * FROM '.$db['chants'].' WHERE id = '.$id;
$sql1 = 'SELECT * FROM '.db('chants').' WHERE id = '.$id;
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
$c = $req1->fetch_assoc();
if(!$c) {
@ -54,7 +54,7 @@ if(array_key_exists('format', $_GET)) {
}
}
$c_p = array();
$sql1 = 'SELECT * FROM '.$db['chant_sources'].' WHERE chant_id = '.$id;
$sql1 = 'SELECT * FROM '.db('chant_sources').' WHERE chant_id = '.$id;
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
while ($s = $req1->fetch_assoc()) {
$c_p[] = array($s['source'], $s['page']);

6
history.php
View File

@ -7,7 +7,7 @@ if(array_key_exists("id", $_GET)) {
} else {
die('No id');
}
$sql1 = 'SELECT * FROM '.$db['chants'].' WHERE id = '.$id;
$sql1 = 'SELECT * FROM '.db('chants').' WHERE id = '.$id;
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
$c = $req1->fetch_assoc();
@ -15,12 +15,12 @@ $title = 'History - '.$c['incipit'];
include('include/header.php');
echo "<h2>$title</h2>\n";
$sql1 = 'SELECT * FROM '.$db['changesets'].' WHERE chant_id = '.$id.' ORDER BY time DESC';
$sql1 = 'SELECT * FROM '.db('changesets').' WHERE chant_id = '.$id.' ORDER BY time DESC';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
while($m = $req1->fetch_assoc()) {
echo "<h4>".date("M d, Y",$m['time'])." (".username_from_id($m['user_id']).")</h4>\n";
echo "<p>".$m['comment']."</p>\n";
$sql2 = 'SELECT * FROM '.$db['changes'].' WHERE changeset = "'.$m['user_id'].'|'.$id.'|'.$m['time'].'" ORDER BY field';
$sql2 = 'SELECT * FROM '.db('changes').' WHERE changeset = "'.$m['user_id'].'|'.$id.'|'.$m['time'].'" ORDER BY field';
$req2 = $mysqli->query($sql2) or die('Erreur SQL !<br />'.$sql2.'<br />'.$mysqli->error);
while($f = $req2->fetch_assoc()) {
echo '<p><i>'.$f['field']."</i><br />\n";

4
incipit.php
View File

@ -11,9 +11,9 @@ include('include/header.php');
echo "<h2>$title</h2>\n";
if($l) {
$sql1 = 'SELECT * FROM '.$db['chants'].' WHERE `incipit` LIKE "'.$l.'%" ORDER BY incipit ASC';
$sql1 = 'SELECT * FROM '.db('chants').' WHERE `incipit` LIKE "'.$l.'%" ORDER BY incipit ASC';
} else {
$sql1 = 'SELECT * FROM '.$db['chants'].' WHERE `incipit` LIKE "" ORDER BY incipit ASC';
$sql1 = 'SELECT * FROM '.db('chants').' WHERE `incipit` LIKE "" ORDER BY incipit ASC';
}
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
$chants = array();

13
include/db.php
View File

@ -18,21 +18,12 @@ $mysqli = new mysqli(HOST, USER, PASSWORD, DATABASE);
$mysqli->query('SET NAMES utf8');
function db($s) {
$db_prefix = 'gregobase_';
function db($s) {
global $db_prefix;
return $db_prefix.$s;
}
$db_prefix = 'gregobase_';
$db = array('booklets' => $db_prefix.'booklets',
'chants' => $db_prefix.'chants',
'chant_sources' => $db_prefix.'chant_sources',
'sources' => $db_prefix.'sources',
'changes' => $db_prefix.'changes',
'changesets' => $db_prefix.'changesets',
'users' => $db_prefix.'users',
'proofreading' => $db_prefix.'proofreading');
require_once('./wp-blog-header.php');
$current_user = wp_get_current_user();
$logged_in = is_user_logged_in();

7
include/header.php
View File

@ -117,12 +117,11 @@ echo <<<HEADER1
<link rel='stylesheet' type='text/css' href='http://fonts.googleapis.com/css?family=Libre+Baskerville:400,700,400italic' />
<link rel="stylesheet" type="text/css" href="style.css" />
HEADER1;
if(!$logged_in) {
echo '<script type="text/javascript" src="sha512.js"></script>
<script type="text/javascript" src="forms.js"></script>
';
if(isset($custom_header)) {
echo $custom_header;
}
echo <<<HEADER2
</head>
<body>

2
include/sources.php
View File

@ -1,7 +1,7 @@
<?php
$sources = array();
$sql1 = 'SELECT * FROM '.$db['sources'].' ORDER BY year,editor,title';
$sql1 = 'SELECT * FROM '.db('sources').' ORDER BY year,editor,title';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error());
while ($s = $req1->fetch_assoc()) {
$sources[$s['id']] = array('year' => $s['year'], 'editor' => $s['editor'], 'title' => $s['title'], 'description' => $s['description'], 'caption' => $s['caption'], 'pages' => json_decode($s['pages']));

8
scores.php
View File

@ -7,7 +7,7 @@ include('include/header.php');
echo "<h3>Chants</h3>\n";
echo "<h4>by source</h4>\n";
$sql1 = 'SELECT * FROM '.$db['chant_sources'].' GROUP BY source';
$sql1 = 'SELECT * FROM '.db('chant_sources').' GROUP BY source';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
echo "<div><ul>\n";
$used_sources = array();
@ -19,14 +19,14 @@ foreach($sources as $id => $s) {
echo "<li><a href=\"source.php?id=".$id."\">".$s['year']." - ".$s['editor']." - ".$s['title']."</a></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)';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error());
if($req1->num_rows > 0) {
echo "<li><a href=\"source.php?id=none\">No source</a></li>\n";
}
echo "</ul></div>\n";
echo "<h4>by usage</h4>\n";
$sql1 = 'SELECT * FROM '.$db['chants'].' WHERE `office-part` != "" GROUP BY `office-part` ORDER BY `office-part`';
$sql1 = 'SELECT * FROM '.db('chants').' WHERE `office-part` != "" GROUP BY `office-part` ORDER BY `office-part`';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error());
echo "<div><ul>\n";
while($s = $req1->fetch_assoc()) {
@ -34,7 +34,7 @@ while($s = $req1->fetch_assoc()) {
}
echo "</ul></div>\n";
echo "<h4>by incipit</h4>\n";
$sql1 = 'SELECT DISTINCT UPPER(SUBSTRING(incipit,1,1)) AS letters FROM '.$db['chants'].' ORDER BY letters ASC';
$sql1 = 'SELECT DISTINCT UPPER(SUBSTRING(incipit,1,1)) AS letters FROM '.db('chants').' ORDER BY letters ASC';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error());
echo "<div><ul>\n";
while($s = $req1->fetch_assoc()) {

4
source.php
View File

@ -9,13 +9,13 @@ if(array_key_exists("id", $_GET)) {
}
$chants = array();
if($s == "none") {
$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)';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
while($c = $req1->fetch_assoc()) {
$chants[''][] = array($c['id'],1,1);
}
} else {
$sql1 = 'SELECT * FROM '.$db['chant_sources'].' WHERE `source` = "'.$s.'" ORDER BY sequence ASC';
$sql1 = 'SELECT * FROM '.db('chant_sources').' WHERE `source` = "'.$s.'" ORDER BY sequence ASC';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
while($c = $req1->fetch_assoc()) {
$chants[$c['page']][] = array($c['chant_id'],$c['sequence'],$c['extent']);

2
usage.php
View File

@ -13,7 +13,7 @@ if(!array_key_exists($id,$txt['usage'])) {
$title = 'Usage - '.$txt['usage'][$id];
include('include/header.php');
echo "<h2>$title</h2>\n";
$sql1 = 'SELECT * FROM '.$db['chants'].' WHERE `office-part` = "'.$id.'" ORDER BY incipit ASC';
$sql1 = 'SELECT * FROM '.db('chants').' WHERE `office-part` = "'.$id.'" ORDER BY incipit ASC';
$req1 = $mysqli->query($sql1) or die('Erreur SQL !<br />'.$sql1.'<br />'.$mysqli->error);
$chants = array();
while($c = $req1->fetch_assoc()) {