'),u=b(''),f=b(''));D=b('').append('').appendTo(f);
+D.append(j=b(''),E=b(''),n=b(''),z=b(''),A=b(''));E.click(b.fancybox.close);t.click(b.fancybox.cancel);z.click(function(a){a.preventDefault();b.fancybox.prev()});A.click(function(a){a.preventDefault();b.fancybox.next()});
+b.fn.mousewheel&&f.bind("mousewheel.fb",function(a,c){if(h)a.preventDefault();else if(b(a.target).get(0).clientHeight==0||b(a.target).get(0).scrollHeight===b(a.target).get(0).clientHeight){a.preventDefault();b.fancybox[c>0?"prev":"next"]()}});b.support.opacity||f.addClass("fancybox-ie");if(M){t.addClass("fancybox-ie6");f.addClass("fancybox-ie6");b('').prependTo(D)}}};
+b.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",
+easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};b(document).ready(function(){b.fancybox.init()})})(jQuery);
\ No newline at end of file
diff --git a/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js b/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
new file mode 100644
index 00000000000..cb66588e29c
--- /dev/null
+++ b/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
@@ -0,0 +1,14 @@
+/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
+* Licensed under the MIT License (LICENSE.txt).
+*
+* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
+* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
+* Thanks to: Seamus Leahy for adding deltaX and deltaY
+*
+* Version: 3.0.4
+*
+* Requires: 1.2.2+
+*/
+
+(function(d){function g(a){var b=a||window.event,i=[].slice.call(arguments,1),c=0,h=0,e=0;a=d.event.fix(b);a.type="mousewheel";if(a.wheelDelta)c=a.wheelDelta/120;if(a.detail)c=-a.detail/3;e=c;if(b.axis!==undefined&&b.axis===b.HORIZONTAL_AXIS){e=0;h=-1*c}if(b.wheelDeltaY!==undefined)e=b.wheelDeltaY/120;if(b.wheelDeltaX!==undefined)h=-1*b.wheelDeltaX/120;i.unshift(a,c,h,e);return d.event.handle.apply(this,i)}var f=["DOMMouseScroll","mousewheel"];d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=
+f.length;a;)this.addEventListener(f[--a],g,false);else this.onmousewheel=g},teardown:function(){if(this.removeEventListener)for(var a=f.length;a;)this.removeEventListener(f[--a],g,false);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);
\ No newline at end of file
diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
index 847954d2f15..94743aa85e0 100644
--- a/apps/files_imageviewer/js/lightbox.js
+++ b/apps/files_imageviewer/js/lightbox.js
@@ -1,12 +1,4 @@
-
-var lightBoxShown=false;
$(document).ready(function() {
- images={};//image cache
- var overlay=$('');
- $( 'body' ).append(overlay);
- var container=$('');
- $( 'body' ).append(container);
- $( 'body' ).click(hideLightbox);
if(typeof FileActions!=='undefined'){
FileActions.register('image','View','',function(filename){
viewImage($('#dir').val(),filename);
@@ -16,7 +8,6 @@ $(document).ready(function() {
OC.search.customResults.Images=function(row,item){
var image=item.link.substr(item.link.indexOf('file=')+5);
var a=row.find('a');
- var container=$('');
a.attr('href','#');
a.click(function(){
var file=image.split('/').pop();
@@ -26,51 +17,11 @@ $(document).ready(function() {
}
});
-function viewImage(dir,file){
+function viewImage(dir, file) {
var location=OC.filePath('files','ajax','download.php')+'?files='+file+'&dir='+dir;
- var overlay=$('#lightbox_overlay');
- var container=$('#lightbox');
- overlay.show();
- if(!images[location]){
- var img = new Image();
- img.onload = function(){
- images[location]=img;
- showLightbox(container,img);
- }
- img.src = location;
- }else{
- showLightbox(container,images[location]);
- }
-}
-
-function showLightbox(container,img){
- var maxWidth = $( window ).width() - 50;
- var maxHeight = $( window ).height() - 50;
- if( img.width > maxWidth || img.height > maxHeight ) { // One of these is larger than the window
- var ratio = img.width / img.height;
- if( img.height >= maxHeight ) {
- img.height = maxHeight;
- img.width = maxHeight * ratio;
- } else {
- img.width = maxWidth;
- img.height = maxWidth / ratio;
- }
- }
- container.empty();
- container.append(img);
- container.css('top',Math.round( ($( window ).height() - img.height)/2));
- container.css('left',Math.round( ($( window ).width() - img.width)/2));
- $('#lightbox').show();
- setTimeout(function(){
- lightBoxShown=true;
- },100);
-}
-
-function hideLightbox(event){
- if(lightBoxShown){
- event.stopPropagation();
- $('#lightbox_overlay').hide();
- $('#lightbox').hide();
- lightBoxShown=false;
- }
+ $.fancybox({
+ "href": location,
+ "title": file,
+ "titlePosition": "inside"
+ });
}
diff --git a/apps/files_sharing/ajax/getitem.php b/apps/files_sharing/ajax/getitem.php
index 8d51c146523..075ec043eac 100644
--- a/apps/files_sharing/ajax/getitem.php
+++ b/apps/files_sharing/ajax/getitem.php
@@ -33,5 +33,3 @@ while ($source != "" && $source != "/" && $source != "." && $source != $userDire
if (!empty($users)) {
OC_JSON::encodedPrint($users);
}
-
-?>
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
index 6a2b45b3a7d..d1f50994317 100644
--- a/apps/files_sharing/ajax/share.php
+++ b/apps/files_sharing/ajax/share.php
@@ -15,6 +15,7 @@ foreach ($sources as $source) {
$source = $userDirectory.$source;
// If the file doesn't exist, it may be shared with the current user
} else if (!$source = OC_Share::getSource($userDirectory.$source)) {
+ OC_Log::write('files_sharing',"Shared file doesn't exists :".$source,OC_Log::ERROR);
echo "false";
}
try {
@@ -23,6 +24,7 @@ foreach ($sources as $source) {
echo $shared->getToken();
}
} catch (Exception $exception) {
+ OC_Log::write('files_sharing',"Unexpected Error : ".$exception->getMessage(),OC_Log::ERROR);
echo "false";
}
}
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index aaffc3824ea..c0fc91e92ad 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -1,8 +1,11 @@
$(document).ready(function() {
+ var shared_status = {};
if (typeof FileActions !== 'undefined') {
FileActions.register('all', 'Share', function(filename) {
var icon;
var file = $('#dir').val()+'/'+filename;
+ if(shared_status[file])
+ return shared_status[file].icon;
$.ajax({
type: 'GET',
url: OC.linkTo('files_sharing', 'ajax/getitem.php'),
@@ -20,6 +23,7 @@ $(document).ready(function() {
} else {
icon = OC.imagePath('core', 'actions/share');
}
+ shared_status[file]= { timestamp: new Date().getTime(), icon: icon };
}
});
return icon;
@@ -54,6 +58,7 @@ $(document).ready(function() {
$(this).click(function(event) {
if (!($(event.target).hasClass('drop')) && $(event.target).parents().index($('#dropdown')) == -1) {
if ($('#dropdown').is(':visible')) {
+ delete shared_status[$('#dropdown').data('file')]; //Remove File from icon cache
$('#dropdown').hide('blind', function() {
$('#dropdown').remove();
$('tr').removeClass('mouseOver');
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 978847f4a8f..cde33fd1dc5 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -60,7 +60,7 @@ class OC_Share {
foreach ($uid_shared_with as $uid) {
// Check if this item is already shared with the user
$checkSource = OC_DB::prepare("SELECT source FROM *PREFIX*sharing WHERE source = ? AND uid_shared_with ".self::getUsersAndGroups($uid));
- $resultCheckSource = $checkSource->execute(array($source, $uid))->fetchAll();
+ $resultCheckSource = $checkSource->execute(array($source))->fetchAll();
// TODO Check if the source is inside a folder
if (count($resultCheckSource) > 0 && !isset($gid)) {
throw new Exception("This item is already shared with ".$uid);
@@ -282,6 +282,7 @@ class OC_Share {
return $result[0]['permissions'];
}
} else {
+ OC_Log::write('files_sharing',"Not existing parent folder : ".$target,OC_Log::ERROR);
return false;
}
}
diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 53f25b60e91..faf4e68d9b1 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -22,6 +22,11 @@
require_once( 'lib_share.php' );
+if (!OC_Filesystem::is_dir('/Shared')) {
+ OC_Filesystem::mkdir('/Shared');
+}
+OC_Filesystem::mount('shared',array('datadir'=>'/'.OC_User::getUser().'/files/Shared'),'/'.OC_User::getUser().'/files/Shared/');
+
/**
* Convert target path to source path and pass the function call to the correct storage provider
*/
@@ -32,13 +37,6 @@ class OC_Filestorage_Shared extends OC_Filestorage {
public function __construct($arguments) {
$this->datadir = $arguments['datadir'];
- if (OC_Share::getItemsInFolder($this->datadir)) {
- if (!OC_Filesystem::is_dir($this->datadir)) {
- OC_Filesystem::mkdir($this->datadir);
- }
- } else if (OC_Filesystem::is_dir($this->datadir)) {
- OC_Filesystem::rmdir($this->datadir);
- }
$this->datadir .= "/";
}
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
index a2581d4143f..e3581a16a6d 100644
--- a/apps/files_texteditor/js/editor.js
+++ b/apps/files_texteditor/js/editor.js
@@ -63,27 +63,18 @@ function showControls(filename){
function bindControlEvents(){
$("#editor_save").live('click',function() {
- if(editorIsShown()){
+ if(is_editor_shown){
doFileSave();
}
});
$('#editor_close').live('click',function() {
- if(editorIsShown()){
+ if(is_editor_shown){
hideFileEditor();
}
});
}
-function editorIsShown(){
- // Not working as intended.
- if($('#editor').attr('editorshown')=='true'){
- return true;
- } else {
- return false;
- }
-}
-
function updateSessionFileHash(path){
$.get(OC.filePath('files_texteditor','ajax','loadfile.php'),
{ path: path },
@@ -94,7 +85,7 @@ function updateSessionFileHash(path){
}, "json");}
function doFileSave(){
- if(editorIsShown()){
+ if(is_editor_shown){
$('#editor_save').after('
+')
');
var filecontents = window.aceEditor.getSession().getValue();
var dir = $('#editor').attr('data-dir');
@@ -154,13 +145,12 @@ function giveEditorFocus(){
};
function showFileEditor(dir,filename){
- if(!editorIsShown()){
+ if(!is_editor_shown){
// Loads the file editor and display it.
var data = $.ajax({
url: OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent(dir),
complete: function(data){
// Initialise the editor
- $('#editor').attr('editorshown','true');
updateSessionFileHash(dir+'/'+filename);
showControls(filename);
$('table').fadeOut('slow', function() {
@@ -180,6 +170,7 @@ function showFileEditor(dir,filename){
}
// End ajax
});
+ is_editor_shown = true;
}
}
@@ -201,11 +192,13 @@ function hideFileEditor(){
$('.actions,#file_access_panel').fadeIn('slow');
$('table').fadeIn('slow');
});
+ is_editor_shown = false;
}
$(window).resize(function() {
setEditorSize();
});
+var is_editor_shown = false;
$(document).ready(function(){
if(typeof FileActions!=='undefined'){
@@ -226,6 +219,7 @@ $(document).ready(function(){
a.click(function(){
var file=text.split('/').pop();
var dir=text.substr(0,text.length-file.length-1);
+ // TODO this will only work in the files app.
showFileEditor(dir,file);
});
}
diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
index ea2969e0110..230e2a5c21d 100644
--- a/apps/gallery/templates/view_album.php
+++ b/apps/gallery/templates/view_album.php
@@ -1,9 +1,17 @@
+
@@ -12,7 +20,7 @@ OC_Util::addStyle( 'files_imageviewer', 'lightbox' ); -
'; $entry .= 'Offending command was: '.$result->getDebugInfo().'
'; - if(defined("DEBUG") && DEBUG) {error_log( $entry );} + OC_Log::write('removeStorage',$entry,OC_Log::ERROR); die( $entry ); } $ret = array(); @@ -24,7 +24,7 @@ class OC_remoteStorage { if( PEAR::isError($result)) { $entry = 'DB Error: "'.$result->getMessage().'"
'; $entry .= 'Offending command was: '.$result->getDebugInfo().'
'; - if(defined("DEBUG") && DEBUG) {error_log( $entry );} + OC_Log::write('removeStorage',$entry,OC_Log::ERROR); die( $entry ); } $ret = array(); @@ -45,7 +45,7 @@ class OC_remoteStorage { if( PEAR::isError($result)) { $entry = 'DB Error: "'.$result->getMessage().'"
'; $entry .= 'Offending command was: '.$result->getDebugInfo().'
'; - if(defined("DEBUG") && DEBUG) {error_log( $entry );} + OC_Log::write('removeStorage',$entry,OC_Log::ERROR); die( $entry ); } } @@ -56,7 +56,7 @@ class OC_remoteStorage { if( PEAR::isError($result)) { $entry = 'DB Error: "'.$result->getMessage().'"
'; $entry .= 'Offending command was: '.$result->getDebugInfo().'
'; - if(defined("DEBUG") && DEBUG) {error_log( $entry );} + OC_Log::write('removeStorage',$entry,OC_Log::ERROR); die( $entry ); } } diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php index 546f9f4565a..912019a9700 100644 --- a/apps/user_openid/appinfo/app.php +++ b/apps/user_openid/appinfo/app.php @@ -26,14 +26,14 @@ OC_User::useBackend('openid'); //check for results from openid requests if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){ - if(defined("DEBUG") && DEBUG) {error_log('openid retured');} + OC_Log::write('user_openid','openid retured',OC_Log::DEBUG); $openid = new SimpleOpenID; $openid->SetIdentity($_GET['openid_identity']); $openid_validation_result = $openid->ValidateWithServer(); if ($openid_validation_result == true){ // OK HERE KEY IS VALID - if(defined("DEBUG") && DEBUG) {error_log('auth sucessfull');} + OC_Log::write('user_openid','auth sucessfull',OC_Log::DEBUG); $identity=$openid->GetIdentity(); - if(defined("DEBUG") && DEBUG) {error_log("auth as $identity");} + OC_Log::write('user_openid','auth as '.$identity,OC_Log::DEBUG); $user=OC_USER_OPENID::findUserForIdentity($identity); if($user){ $_SESSION['user_id']=$user; @@ -41,13 +41,13 @@ if(isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'id_res'){ } }else if($openid->IsError() == true){ // ON THE WAY, WE GOT SOME ERROR $error = $openid->GetError(); - if(defined("DEBUG") && DEBUG) {error_log("ERROR CODE: " . $error['code']);} - if(defined("DEBUG") && DEBUG) {error_log("ERROR DESCRIPTION: " . $error['description']);} + OC_Log::write('user_openid','ERROR CODE: '. $error['code'],OC_Log::ERROR); + OC_Log::write('user_openid','ERROR DESCRIPTION: '. $error['description'],OC_Log::ERROR); }else{ // Signature Verification Failed - if(defined("DEBUG") && DEBUG) {error_log("INVALID AUTHORIZATION");} + OC_Log::write('user_openid','INVALID AUTHORIZATION',OC_Log::ERROR); } }else if (isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'cancel'){ // User Canceled your Request - if(defined("DEBUG") && DEBUG) {error_log("USER CANCELED REQUEST");} + OC_Log::write('user_openid','USER CANCELED REQUEST',OC_Log::DEBUG); return false; } diff --git a/apps/user_openid/phpmyid.php b/apps/user_openid/phpmyid.php index 5009fa410aa..ef01e7a046d 100644 --- a/apps/user_openid/phpmyid.php +++ b/apps/user_openid/phpmyid.php @@ -603,7 +603,7 @@ function test_mode () { $res['gmp'] = 'pass - n/a'; } - // sys_get_temp_dir + // get_temp_dir $res['logfile'] = is_writable($profile['logfile']) ? 'pass' : "warn - log is not writable"; @@ -1053,8 +1053,6 @@ function debug ($x, $m = null) { } else { $x .= "\n"; } - - if(defined("DEBUG") && DEBUG) {error_log($x . "\n", 3, $profile['logfile']);} } @@ -1375,33 +1373,6 @@ function str_diff_at ($a, $b) { return $n; } - -if (! function_exists('sys_get_temp_dir') && ini_get('open_basedir') == false) { -/** - * Create function if missing - * @return string - */ -function sys_get_temp_dir () { - $keys = array('TMP', 'TMPDIR', 'TEMP'); - foreach ($keys as $key) { - if (isset($_ENV[$key]) && is_dir($_ENV[$key]) && is_writable($_ENV[$key])) - return realpath($_ENV[$key]); - } - - $tmp = tempnam(false, null); - if (file_exists($tmp)) { - $dir = realpath(dirname($tmp)); - unlink($tmp); - return realpath($dir); - } - - return realpath(dirname(__FILE__)); -}} elseif (! function_exists('sys_get_temp_dir')) { -function sys_get_temp_dir () { - return realpath(dirname(__FILE__)); -}} - - /** * Determine if a child URL actually decends from the parent, and that the * parent is a good URL. @@ -1513,7 +1484,6 @@ function wrap_html ( $message ) {