maj.world

commit 0781e4fc8c0d3d40c3085feccf114ad1fa441dde
tree 61e3d7b2078111dee52d2c1a8e5c543a62381e8a
parent e0af0ab934fa4b5bd5c695c3512adc9aa2d5ba1b
author Engels Antonio <engels@majcms.org> 1294539191 +0800
committer Engels Antonio <engels@majcms.org> 1294539191 +0800

    Holiday release backlog commit

diff --git a/album.php b/album.php
index f5aed1f..25dd648 100644
--- a/album.php
+++ b/album.php
@@ -453,24 +453,11 @@ if (file_exists("images/{$_REQUEST['entry']}/album/{$_REQUEST['show']}")) {
        echo "</td></tr></table>";
 }
 
-// Look into this!
-//
-//if (isset($_SERVER['HTTPS'])) {
-//     $maj_proto = "https://";
-//}
-//else {
-//     $maj_proto = "http://";
-//}
-//
-//$maj_url = $maj_proto . $_SERVER['HTTP_HOST'] . dirname($_SERVER['PHP_SELF']);
-
 if ($key_prev >= 0) {
-       //echo "\n\n<script>\n\tvar img_prev = new Image();\n\timg_prev.src = \"$maj_url/images/{$_REQUEST['entry']}/album/$show_prev\";\n</script>";
        echo "\n\n<script>\n\tvar img_prev = new Image();\n\timg_prev.src = \"images/{$_REQUEST['entry']}/album/$show_prev\";\n</script>";
 }
 
 if ($key_next < $count_album_entry) {
-       //echo "\n\n<script>\n\tvar img_next = new Image();\n\timg_next.src = \"$maj_url/images/{$_REQUEST['entry']}/album/$show_next\";\n</script>";
        echo "\n\n<script>\n\tvar img_next = new Image();\n\timg_next.src = \"images/{$_REQUEST['entry']}/album/$show_next\";\n</script>";
 }
 
diff --git a/index.php b/index.php
index 9169f27..bc018bc 100644
--- a/index.php
+++ b/index.php
@@ -2558,7 +2558,7 @@ foreach ($maj_disp as $maj_d) {
                        }
                }
 
-               echo $maj_entry_body;
+               echo "$maj_entry_body";
        }
 
        if ((file_get_contents("data/username.txt") == $maj_author) and file_exists("data/sig.txt") and file_exists("data/bb.txt") and file_exists("data/bb-sig.txt")) {
@@ -2570,6 +2570,20 @@ foreach ($maj_disp as $maj_d) {
                echo "<br><br>--<br>$maj_sig";
        }
 
+       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']), "/\\") . "/index.php?entry=$maj_d";
+               }
+               else {
+                       $entry_url = "http://" . $_SERVER['HTTP_HOST'] . rtrim(dirname($_SERVER['PHP_SELF']), "/\\") . "/index.php?entry=$maj_d";
+               }
+
+               $entry_url = rawurlencode($entry_url);
+
+               echo "<br><br><iframe src=\"http://www.facebook.com/plugins/like.php?href=$entry_url&amp;layout=standard&amp;show_faces=false&amp;width=513&amp;action=like&amp;colorscheme=light&amp;height=23\" scrolling=\"no\" frameborder=\"0\" style=\"border:none; overflow:hidden; width:513px; height:23px;\" allowTransparency=\"true\"></iframe>";
+       }
+
        if (isset($maj_d_text_b)) {
                echo "</font>";
        }
diff --git a/rel.txt b/rel.txt
index a2d124c..4bd2876 100644
--- a/rel.txt
+++ b/rel.txt
@@ -1 +1 @@
-201011081123
+201011300755