maj.world

commit b2900f78c6757ee7a5ef44de8865c971deae3cda
tree efdb4df0ae2cdbef8e246e2b70c6c63f7e0c188e
parent 65b35317f98adc2c9eff39e4b3d210057e9ba5cc
author Engels Antonio <engels@majcms.org> 1294539196 +0800
committer Engels Antonio <engels@majcms.org> 1294539196 +0800

    Holiday release backlog commit

diff --git a/album.php b/album.php
index 25dd648..66e2fb5 100644
--- a/album.php
+++ b/album.php
@@ -319,7 +319,7 @@ if (file_exists("images/{$_REQUEST['entry']}/album/{$_REQUEST['show']}")) {
 
        echo "</table>";
 
-       echo "</td><td rowspan=\"3\" width=\"10\"></td><td valign=\"top\" rowspan=\"3\">";
+       echo "</td><td width=\"10\"></td><td valign=\"top\">";
 
        //if(isset($album_image_info['APP13'])) {
        //
@@ -343,13 +343,31 @@ if (file_exists("images/{$_REQUEST['entry']}/album/{$_REQUEST['show']}")) {
                       
                        $album_image_exif_value = strip_tags($album_image_exif_value);
 
-                       if ((($album_image_exif_key == "EXIF") or ($album_image_exif_key == "IFD0")) and !empty($album_image_exif_value) and ($album_image_exif_name != "MakerNote") and ($album_image_exif_name != "ComponentsConfiguration") and ($album_image_exif_name != "FileSource") and ($album_image_exif_name != "SceneType") and ($album_image_exif_name != "CFAPattern")) {
+                       if ((($album_image_exif_key == "EXIF") or ($album_image_exif_key == "IFD0")) and !empty($album_image_exif_value) and ($album_image_exif_name != "MakerNote") and ($album_image_exif_name != "ComponentsConfiguration") and ($album_image_exif_name != "FileSource") and ($album_image_exif_name != "SceneType") and ($album_image_exif_name != "CFAPattern") and !preg_match("/UndefinedTag/",$album_image_exif_name)) {
                                echo "<nobr>$album_image_exif_name: $album_image_exif_value</nobr><br>";
                        }
                }
        }
 
-       echo "</td></tr><tr><td height=\"10\"></td></tr><tr><td valign=\"top\">";
+       echo "</td></tr></table>";
+      
+      
+//     if (file_exists("data/fb.txt") and file_exists("data/items/$maj_d/fb.txt")) {
+      
+               if (isset($_SERVER['HTTPS'])) {
+                       $entry_url = "https://" . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), "/\\") . "/album.php?entry={$_REQUEST['entry']}&show={$_REQUEST['show']}";
+               }
+               else {
+                       $entry_url = "http://" . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), "/\\") . "/album.php?entry={$_REQUEST['entry']}&show={$_REQUEST['show']}";
+               }
+
+               $entry_url = rawurlencode($entry_url);
+
+               echo "<div style=\"margin: 4px;\"><iframe src=\"http://www.facebook.com/plugins/like.php?href=$entry_url&amp;layout=standard&amp;show_faces=true&amp;width=320&amp;action=like&amp;colorscheme=light&amp;height=80\" scrolling=\"no\" frameborder=\"0\" style=\"border:none; overflow:hidden; width:320px; height:80px;\" allowTransparency=\"true\"></iframe></div>";
+//     }
+
+      
+       echo "<table border=\"0\" cellspacing=\"1\" cellpadding=\"2\"><tr><td valign=\"top\" colspan=\"3\">";
 
        echo "<table cellspacing=1 cellpadding=2 border=0 bgcolor=#cccccc><tr bgcolor=#ffffff><td width=100%><p><b>Album</b></p></td></tr><tr bgcolor=#ffffff><td width=100%>";
 
diff --git a/rel.txt b/rel.txt
index eed0db1..1711105 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-201012240427
+201012260422