Profile
MAJ is an Open Source, PHP-based content management system (CMS) that can be deployed as a blog, bulletin or message board, Internet forum, and wiki. It is extensible via PHP panels and is HTML5 and CSS3 ready.
Git
This commit has been accessed 862 times via Git panel.

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
 
Credits
Sunday, Sep 18, 2005, 12:00 AM (Revision 11 - Thursday, Jul 14, 2011, 7:30 PM)
Open Source enables software developers to stand on the shoulders of giants instead of reinventing the wheel, so to speak. Kudos and many thanks to the folks who made their work freely available for reuse in MAJ.

read more
Bugs and Exploits
Friday, Aug 26, 2005, 12:00 AM (Revision 23 - Wednesday, May 29, 2013, 5:25 AM)
Although MAJ started as a family project, care has been taken to make it as "safe" as possible. With more people now working on MAJ, bugs and exploitable code may sometimes slip in. We invite you to poke around and see if you can find any. Generally, there are two things you can do when you find a MAJ or PHP-related bug or exploit:

1. Take advantage of it. But hey, what's so exciting about messing up someone's blog? Ho-hum, right?
2. Report it here so that we can work on a fix and make MAJ better.

read more
Search
Download
MAJ 2.0
75 files
32980 downloads
MAJ 1.0
26 files
13132 downloads
MAJ 0.14
45 files
35010 downloads