Last update before merging newbranch with master.

simonewebdesign · Oct 2, 2012 · b86a5af · b86a5af
1 parent 2b2b607
commit b86a5af
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 33 deletions.
diff --git a/application/includes/disc.php b/application/includes/disc.php
@@ -1,7 +1,7 @@
 <div class="disc clearfix">
 
 	<a class="fancybox" rel="discs" href="<?=ROOT?>img/covers/<?=$disc->id?>.png">
-		<img class="lazy" src="<?=ROOT?>img/trans.gif" data-original="<?=ROOT?>img/covers/<?=$disc->id?>.png" width=200 alt="<?=$disc->title?>">
+		<img class="lazy" src="<?=ROOT?>img/trans.gif" data-original="<?=ROOT?>img/covers/<?=$disc->id?>.png" width=200 alt="<?=htmlentities($disc->title, ENT_QUOTES)?>">
 	</a>
 
 	<div class=metadata>

diff --git a/application/includes/paper.php b/application/includes/paper.php
@@ -1,2 +1,2 @@
 
-<a class="fancybox paper" rel="papers" href="<?=ROOT?>img/papers/<?=$paper['caption']?>.jpg" title="<?=$paper['caption']?> <a href='http://prendinota.eu'>&raquo; <?=$lang == 'it' ? 'Vai al sito' : 'Go to website'?></a>">	<img class="lazy" src="<?=ROOT?>img/trans.gif" data-original="<?=ROOT?>img/papers/<?=$paper['caption']?>.jpg" width=200></a>
+<a class="fancybox paper" rel="papers" href="<?=ROOT?>img/papers/<?=htmlentities($paper['caption'], ENT_QUOTES)?>.jpg" title="<?=htmlentities($paper['caption'], ENT_QUOTES)?> <a href='http://prendinota.eu'>&raquo; <?=$lang == 'it' ? 'Vai al sito' : 'Go to website'?></a>">	<img class="lazy" src="<?=ROOT?>img/trans.gif" data-original="<?=ROOT?>img/papers/<?=$paper['caption']?>.jpg" width=200 alt="<?=htmlentities($paper['caption'], ENT_QUOTES)?>"></a>

diff --git a/application/includes/photo.php b/application/includes/photo.php
@@ -1 +1 @@
-<a class="fancybox photo" rel="photos" href="<?=ROOT.$photos_folder.$i.$photos_ext?>" title="<?=$photos_info[$i]['caption_'.$lang]?>">	<img class="lazy" src="<?=ROOT?>img/trans.gif" data-original="<?=ROOT.$photos_folder.$i.$photos_ext?>" width=200></a>
+<a class="fancybox photo" rel="photos" href="<?=ROOT.$photos_folder.$i.$photos_ext?>" title='<?=htmlentities($photos_info[$i]['caption_'.$lang], ENT_QUOTES)?>'>	<img class="lazy" src="<?=ROOT?>img/trans.gif" data-original="<?=ROOT.$photos_folder.$i.$photos_ext?>" width=200 alt="<?=htmlentities($photos_info[$i]['caption_'.$lang], ENT_QUOTES)?>"></a>

diff --git a/application/includes/track.php b/application/includes/track.php
@@ -1,31 +1,19 @@
-<div id=track<?=$track->id?> class=track itemscope itemtype="http://schema.org/MusicRecording">
-
-	<h3 itemprop=name><?=$i?>) <?=$track->title?></h3>
-<<<<<<< HEAD
-
-	<audio preload=none controls>
-
-    <?php foreach ($extensions as $ext) { ?>
-      <source src="<?=ROOT?>media/audio/<?=$track->id?>.<?=$ext?>" itemprop=audio>
-    <?php } ?>
-
-    <?php if ($lang == 'en') { ?>
-      <small>Your Web Browser doesn't support the HTML5 &lt;audio&gt; element. Please <a href="http://www.mozilla.org/firefox" class="upgrade-browser">upgrade it NOW</a>!</small>
-    <?php } else { ?>
-      <small>Il tuo Web Browser non supporta l'elemento HTML5 &lt;audio&gt;. <a href="http://www.mozilla.org/firefox" class="upgrade-browser">Aggiorna ORA il tuo Browser</a>!</small>
-    <?php } ?>
-
-=======
-	<audio controls preload=none>
-	<?php foreach ($extensions as $ext) { ?>
-		<source src="<?=ROOT?>media/audio/<?=$track->id?>.<?=$ext?>" itemprop=audio>-
-	<?php } ?>
-	<?php if ($lang == 'en') { ?>
-		<small>Your web browser doesn't support audio. Please <a href="http://www.mozilla.org/firefox" class="upgrade-browser">download Firefox</a> for free.</small>
-	<?php } else { ?>
-		<small>Il tuo browser web non supporta l'audio. <a href="http://www.mozilla.org/firefox" class="upgrade-browser">Scarica Firefox</a> gratuitamente.</small>
-	<?php } ?>
->>>>>>> 2e15e17f6e67dbb10bff4cb884f3fc33ed0cf257
-	</audio>
-
+<div id=track<?=$track->id?> class=track itemscope itemtype="http://schema.org/MusicRecording">
+
+	<h3 itemprop=name><?=$i?>) <?=$track->title?></h3>
+
+	<audio preload=none controls>
+
+    <?php foreach ($extensions as $ext) { ?>
+      <source src="<?=ROOT?>media/audio/<?=$track->id?>.<?=$ext?>" itemprop=audio>
+    <?php } ?>
+
+    <?php if ($lang == 'en') { ?>
+      <small>Your web browser doesn't support audio. Please <a href="http://www.mozilla.org/firefox" class="upgrade-browser">download Firefox</a> for free.</small>
+    <?php } else { ?>
+      <small>Il tuo browser web non supporta l'audio. <a href="http://www.mozilla.org/firefox" class="upgrade-browser">Scarica Firefox</a> gratuitamente.</small>
+    <?php } ?>
+
+	</audio>
+
 </div>