From 8465ad6e1e2a59474a19a8ab9eebd675b0d86b34 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sat, 21 Apr 2012 00:22:48 +0530 Subject: [PATCH 1/3] Few more files with unnecessary executable permissions --- include/security.php | 0 view/theme/diabook-aerith/ch_directory_item.tpl | 0 view/theme/diabook-aerith/directory_item.tpl | 0 view/theme/diabook-aerith/group_side.tpl | 0 view/theme/diabook-aerith/icons/block.png | Bin view/theme/diabook-blue/ch_directory_item.tpl | 0 view/theme/diabook-blue/directory_item.tpl | 0 view/theme/diabook-blue/group_side.tpl | 0 view/theme/diabook-blue/icons/block.png | Bin view/theme/diabook-red/ch_directory_item.tpl | 0 view/theme/diabook-red/directory_item.tpl | 0 view/theme/diabook-red/group_side.tpl | 0 view/theme/diabook-red/icons/block.png | Bin view/theme/diabook/ch_directory_item.tpl | 0 view/theme/diabook/communityhome.tpl | 0 view/theme/diabook/contact_template.tpl | 0 .../diabook/diabook-aerith/ch_directory_item.tpl | 0 .../theme/diabook/diabook-aerith/directory_item.tpl | 0 view/theme/diabook/diabook-aerith/group_side.tpl | 0 view/theme/diabook/diabook-aerith/icons/block.png | Bin .../diabook/diabook-blue/ch_directory_item.tpl | 0 view/theme/diabook/diabook-blue/directory_item.tpl | 0 view/theme/diabook/diabook-blue/group_side.tpl | 0 view/theme/diabook/diabook-blue/icons/block.png | Bin .../diabook/diabook-green/ch_directory_item.tpl | 0 view/theme/diabook/diabook-green/directory_item.tpl | 0 view/theme/diabook/diabook-green/group_side.tpl | 0 view/theme/diabook/diabook-green/icons/block.png | Bin .../diabook/diabook-green/icons/notifications3.png | Bin view/theme/diabook/diabook-green/icons/notify3.png | Bin .../diabook/diabook-pink/ch_directory_item.tpl | 0 view/theme/diabook/diabook-pink/directory_item.tpl | 0 view/theme/diabook/diabook-pink/group_side.tpl | 0 view/theme/diabook/diabook-pink/icons/block.png | Bin .../diabook/diabook-pink/icons/notifications3.png | Bin view/theme/diabook/diabook-pink/icons/notify3.png | Bin .../theme/diabook/diabook-red/ch_directory_item.tpl | 0 view/theme/diabook/diabook-red/directory_item.tpl | 0 view/theme/diabook/diabook-red/group_side.tpl | 0 view/theme/diabook/diabook-red/icons/block.png | Bin view/theme/diabook/directory_item.tpl | 0 view/theme/diabook/group_side.tpl | 0 view/theme/diabook/icons/attach.png | Bin view/theme/diabook/icons/audio.png | Bin view/theme/diabook/icons/block.png | Bin view/theme/diabook/icons/camera.png | Bin view/theme/diabook/icons/close_box.png | Bin view/theme/diabook/icons/contacts2.png | Bin view/theme/diabook/icons/drop.png | Bin view/theme/diabook/icons/expand.png | Bin view/theme/diabook/icons/file_as.png | Bin view/theme/diabook/icons/link.png | Bin view/theme/diabook/icons/lock.png | Bin view/theme/diabook/icons/lupe.png | Bin view/theme/diabook/icons/next.png | Bin view/theme/diabook/icons/notifications.png | Bin view/theme/diabook/icons/notifications3.png | Bin view/theme/diabook/icons/notify.png | Bin view/theme/diabook/icons/notify3.png | Bin view/theme/diabook/icons/pencil.png | Bin view/theme/diabook/icons/prev.png | Bin view/theme/diabook/icons/recycle.png | Bin view/theme/diabook/icons/remote.png | Bin view/theme/diabook/icons/scroll_top.png | Bin view/theme/diabook/icons/star.png | Bin view/theme/diabook/icons/starred.png | Bin view/theme/diabook/icons/tagged.png | Bin view/theme/diabook/icons/unlock.png | Bin view/theme/diabook/icons/unstarred.png | Bin view/theme/diabook/icons/video.png | Bin view/theme/diabook/icons/weblink.png | Bin view/theme/diabook/jot.tpl | 0 view/theme/diabook/mail_conv.tpl | 0 view/theme/diabook/search_item.tpl | 0 view/theme/diabook/theme.php | 0 75 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 include/security.php mode change 100755 => 100644 view/theme/diabook-aerith/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook-aerith/directory_item.tpl mode change 100755 => 100644 view/theme/diabook-aerith/group_side.tpl mode change 100755 => 100644 view/theme/diabook-aerith/icons/block.png mode change 100755 => 100644 view/theme/diabook-blue/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook-blue/directory_item.tpl mode change 100755 => 100644 view/theme/diabook-blue/group_side.tpl mode change 100755 => 100644 view/theme/diabook-blue/icons/block.png mode change 100755 => 100644 view/theme/diabook-red/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook-red/directory_item.tpl mode change 100755 => 100644 view/theme/diabook-red/group_side.tpl mode change 100755 => 100644 view/theme/diabook-red/icons/block.png mode change 100755 => 100644 view/theme/diabook/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/communityhome.tpl mode change 100755 => 100644 view/theme/diabook/contact_template.tpl mode change 100755 => 100644 view/theme/diabook/diabook-aerith/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-aerith/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-aerith/group_side.tpl mode change 100755 => 100644 view/theme/diabook/diabook-aerith/icons/block.png mode change 100755 => 100644 view/theme/diabook/diabook-blue/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-blue/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-blue/group_side.tpl mode change 100755 => 100644 view/theme/diabook/diabook-blue/icons/block.png mode change 100755 => 100644 view/theme/diabook/diabook-green/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-green/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-green/group_side.tpl mode change 100755 => 100644 view/theme/diabook/diabook-green/icons/block.png mode change 100755 => 100644 view/theme/diabook/diabook-green/icons/notifications3.png mode change 100755 => 100644 view/theme/diabook/diabook-green/icons/notify3.png mode change 100755 => 100644 view/theme/diabook/diabook-pink/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-pink/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-pink/group_side.tpl mode change 100755 => 100644 view/theme/diabook/diabook-pink/icons/block.png mode change 100755 => 100644 view/theme/diabook/diabook-pink/icons/notifications3.png mode change 100755 => 100644 view/theme/diabook/diabook-pink/icons/notify3.png mode change 100755 => 100644 view/theme/diabook/diabook-red/ch_directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-red/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/diabook-red/group_side.tpl mode change 100755 => 100644 view/theme/diabook/diabook-red/icons/block.png mode change 100755 => 100644 view/theme/diabook/directory_item.tpl mode change 100755 => 100644 view/theme/diabook/group_side.tpl mode change 100755 => 100644 view/theme/diabook/icons/attach.png mode change 100755 => 100644 view/theme/diabook/icons/audio.png mode change 100755 => 100644 view/theme/diabook/icons/block.png mode change 100755 => 100644 view/theme/diabook/icons/camera.png mode change 100755 => 100644 view/theme/diabook/icons/close_box.png mode change 100755 => 100644 view/theme/diabook/icons/contacts2.png mode change 100755 => 100644 view/theme/diabook/icons/drop.png mode change 100755 => 100644 view/theme/diabook/icons/expand.png mode change 100755 => 100644 view/theme/diabook/icons/file_as.png mode change 100755 => 100644 view/theme/diabook/icons/link.png mode change 100755 => 100644 view/theme/diabook/icons/lock.png mode change 100755 => 100644 view/theme/diabook/icons/lupe.png mode change 100755 => 100644 view/theme/diabook/icons/next.png mode change 100755 => 100644 view/theme/diabook/icons/notifications.png mode change 100755 => 100644 view/theme/diabook/icons/notifications3.png mode change 100755 => 100644 view/theme/diabook/icons/notify.png mode change 100755 => 100644 view/theme/diabook/icons/notify3.png mode change 100755 => 100644 view/theme/diabook/icons/pencil.png mode change 100755 => 100644 view/theme/diabook/icons/prev.png mode change 100755 => 100644 view/theme/diabook/icons/recycle.png mode change 100755 => 100644 view/theme/diabook/icons/remote.png mode change 100755 => 100644 view/theme/diabook/icons/scroll_top.png mode change 100755 => 100644 view/theme/diabook/icons/star.png mode change 100755 => 100644 view/theme/diabook/icons/starred.png mode change 100755 => 100644 view/theme/diabook/icons/tagged.png mode change 100755 => 100644 view/theme/diabook/icons/unlock.png mode change 100755 => 100644 view/theme/diabook/icons/unstarred.png mode change 100755 => 100644 view/theme/diabook/icons/video.png mode change 100755 => 100644 view/theme/diabook/icons/weblink.png mode change 100755 => 100644 view/theme/diabook/jot.tpl mode change 100755 => 100644 view/theme/diabook/mail_conv.tpl mode change 100755 => 100644 view/theme/diabook/search_item.tpl mode change 100755 => 100644 view/theme/diabook/theme.php diff --git a/include/security.php b/include/security.php old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/ch_directory_item.tpl b/view/theme/diabook-aerith/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/directory_item.tpl b/view/theme/diabook-aerith/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/group_side.tpl b/view/theme/diabook-aerith/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-aerith/icons/block.png b/view/theme/diabook-aerith/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-blue/ch_directory_item.tpl b/view/theme/diabook-blue/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-blue/directory_item.tpl b/view/theme/diabook-blue/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-blue/icons/block.png b/view/theme/diabook-blue/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/ch_directory_item.tpl b/view/theme/diabook-red/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/directory_item.tpl b/view/theme/diabook-red/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/group_side.tpl b/view/theme/diabook-red/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook-red/icons/block.png b/view/theme/diabook-red/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/ch_directory_item.tpl b/view/theme/diabook/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/contact_template.tpl b/view/theme/diabook/contact_template.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-aerith/ch_directory_item.tpl b/view/theme/diabook/diabook-aerith/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-aerith/directory_item.tpl b/view/theme/diabook/diabook-aerith/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-aerith/group_side.tpl b/view/theme/diabook/diabook-aerith/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-aerith/icons/block.png b/view/theme/diabook/diabook-aerith/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-blue/ch_directory_item.tpl b/view/theme/diabook/diabook-blue/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-blue/directory_item.tpl b/view/theme/diabook/diabook-blue/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-blue/group_side.tpl b/view/theme/diabook/diabook-blue/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-blue/icons/block.png b/view/theme/diabook/diabook-blue/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/ch_directory_item.tpl b/view/theme/diabook/diabook-green/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/directory_item.tpl b/view/theme/diabook/diabook-green/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/group_side.tpl b/view/theme/diabook/diabook-green/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/icons/block.png b/view/theme/diabook/diabook-green/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/icons/notifications3.png b/view/theme/diabook/diabook-green/icons/notifications3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-green/icons/notify3.png b/view/theme/diabook/diabook-green/icons/notify3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/ch_directory_item.tpl b/view/theme/diabook/diabook-pink/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/directory_item.tpl b/view/theme/diabook/diabook-pink/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/group_side.tpl b/view/theme/diabook/diabook-pink/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/icons/block.png b/view/theme/diabook/diabook-pink/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/icons/notifications3.png b/view/theme/diabook/diabook-pink/icons/notifications3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-pink/icons/notify3.png b/view/theme/diabook/diabook-pink/icons/notify3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-red/ch_directory_item.tpl b/view/theme/diabook/diabook-red/ch_directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-red/directory_item.tpl b/view/theme/diabook/diabook-red/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-red/group_side.tpl b/view/theme/diabook/diabook-red/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/diabook-red/icons/block.png b/view/theme/diabook/diabook-red/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/attach.png b/view/theme/diabook/icons/attach.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/audio.png b/view/theme/diabook/icons/audio.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/block.png b/view/theme/diabook/icons/block.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/camera.png b/view/theme/diabook/icons/camera.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/close_box.png b/view/theme/diabook/icons/close_box.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/contacts2.png b/view/theme/diabook/icons/contacts2.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/drop.png b/view/theme/diabook/icons/drop.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/file_as.png b/view/theme/diabook/icons/file_as.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/link.png b/view/theme/diabook/icons/link.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/lock.png b/view/theme/diabook/icons/lock.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/lupe.png b/view/theme/diabook/icons/lupe.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/notifications3.png b/view/theme/diabook/icons/notifications3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/notify.png b/view/theme/diabook/icons/notify.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/notify3.png b/view/theme/diabook/icons/notify3.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/pencil.png b/view/theme/diabook/icons/pencil.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/recycle.png b/view/theme/diabook/icons/recycle.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/remote.png b/view/theme/diabook/icons/remote.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/scroll_top.png b/view/theme/diabook/icons/scroll_top.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/star.png b/view/theme/diabook/icons/star.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/starred.png b/view/theme/diabook/icons/starred.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/tagged.png b/view/theme/diabook/icons/tagged.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/unlock.png b/view/theme/diabook/icons/unlock.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/unstarred.png b/view/theme/diabook/icons/unstarred.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/video.png b/view/theme/diabook/icons/video.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/icons/weblink.png b/view/theme/diabook/icons/weblink.png old mode 100755 new mode 100644 diff --git a/view/theme/diabook/jot.tpl b/view/theme/diabook/jot.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl old mode 100755 new mode 100644 diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php old mode 100755 new mode 100644 From 4499ce96a0c5fd7ca9feb2b9b5e62876155aa63e Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sat, 21 Apr 2012 12:00:19 +0530 Subject: [PATCH 2/3] Executable permission missing on script --- util/run_xgettext.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 util/run_xgettext.sh diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh old mode 100644 new mode 100755 From 1b3d84422e27b5d1f728a4e4fedc8231e6e81453 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sat, 7 Jul 2012 16:17:26 +0530 Subject: [PATCH 3/3] orient function uses exif_read_data for which valid image types are only JPEG and TIFF as per the document [1]. When trying to upload an screenshot with png type I was getting message as *failed* even though image was uploading. So added a fix to check image type before calling orient function. Not sure if this is a proper fix but after this i'm not getting any error during file upload [1] http://au2.php.net/manual/en/function.exif-read-data.php --- mod/photos.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/photos.php b/mod/photos.php index 624f0bdca..42cad42f9 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -740,7 +740,8 @@ function photos_post(&$a) { killme(); } - $ph->orient($src); + if($ph->getType() != 'image/png') + $ph->orient($src); @unlink($src); $max_length = get_config('system','max_image_length');