From 10c5178e31403b92b42fa59f9bb83f71dbef955a Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Tue, 27 Sep 2011 19:08:38 +0200 Subject: [PATCH 1/9] check for php modules --- lib/util.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/util.php b/lib/util.php index 51d8cc4d643..c7a2c509800 100644 --- a/lib/util.php +++ b/lib/util.php @@ -242,7 +242,14 @@ class OC_Util { $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') not writable by ownCloud
','hint'=>$permissionsHint); } - //TODO: check for php modules + // check if all required php modules are present + if(!class_exists('ZipArchive')){ + $errors[]=array('error'=>'PHP module ZipArchive not installed.
','hint'=>'Please ask your server administrator to install the module.'); + } + + if(!function_exists('mb_detect_encoding')){ + $errors[]=array('error'=>'PHP module mb multibyte not installed.
','hint'=>'Please ask your server administrator to install the module.'); + } return $errors; } From 61aa00899d33a3b9706cf321555405fedf044775 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Tue, 27 Sep 2011 21:56:16 +0200 Subject: [PATCH 2/9] show only most essential stuff in add and edit event form --- apps/calendar/js/calendar.js | 4 ++++ apps/calendar/templates/part.eventform.php | 24 ++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index f8d1c8e650e..1b345452912 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -352,6 +352,10 @@ Calendar={ } },"json"); }, + showadvancedoptions:function(){ + $("#advanced_options").css("display", "block"); + $("#advanced_options_button").css("display", "none"); + }, createEventPopup:function(e){ var popup = $(this).data('popup'); if (!popup){ diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php index 5bb072cc23b..4c34b3e1fcc 100644 --- a/apps/calendar/templates/part.eventform.php +++ b/apps/calendar/templates/part.eventform.php @@ -5,12 +5,6 @@ " value="" maxlength="100" name="title"/> - - t("Location");?>: - - " value="" maxlength="100" name="location" /> - - @@ -60,7 +54,12 @@    -
- + + + +
t("Description");?>:t("Location");?>: + " value="" maxlength="100" name="location" /> +
+ + +
t("Description");?>:
+ From c6f78fbe43dbe3f6875b72b34592bde25fc78d0b Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Tue, 27 Sep 2011 22:36:14 +0200 Subject: [PATCH 3/9] Add flag in info.xml to control the apps that are installed by default --- apps/calendar/appinfo/info.xml | 1 + apps/contacts/appinfo/info.xml | 1 + apps/files_imageviewer/appinfo/info.xml | 3 ++- apps/files_sharing/appinfo/info.xml | 3 ++- apps/files_textviewer/appinfo/info.xml | 1 + apps/media/appinfo/info.xml | 3 ++- apps/user_openid/appinfo/info.xml | 3 ++- lib/installer.php | 8 +++++--- lib/setup.php | 2 +- 9 files changed, 17 insertions(+), 8 deletions(-) diff --git a/apps/calendar/appinfo/info.xml b/apps/calendar/appinfo/info.xml index c846fc1eebc..6b1ecd2337f 100644 --- a/apps/calendar/appinfo/info.xml +++ b/apps/calendar/appinfo/info.xml @@ -7,4 +7,5 @@ Georg Ehrke (Userinterface), Jakob Sack 2 Calendar with CalDAV support + diff --git a/apps/contacts/appinfo/info.xml b/apps/contacts/appinfo/info.xml index 77c9dc91bfc..d18a19c3aea 100644 --- a/apps/contacts/appinfo/info.xml +++ b/apps/contacts/appinfo/info.xml @@ -7,4 +7,5 @@ Jakob Sack 2 Address book with CardDAV support. + diff --git a/apps/files_imageviewer/appinfo/info.xml b/apps/files_imageviewer/appinfo/info.xml index f3b5a67960e..00b55c254dd 100644 --- a/apps/files_imageviewer/appinfo/info.xml +++ b/apps/files_imageviewer/appinfo/info.xml @@ -7,4 +7,5 @@ AGPL Robin Appelman 2 - \ No newline at end of file + + diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml index 2fbb3300f69..abf847b4483 100644 --- a/apps/files_sharing/appinfo/info.xml +++ b/apps/files_sharing/appinfo/info.xml @@ -7,4 +7,5 @@ AGPL Michael Gapczynski 2 - \ No newline at end of file + + diff --git a/apps/files_textviewer/appinfo/info.xml b/apps/files_textviewer/appinfo/info.xml index 209b4140346..becfd5e35c8 100644 --- a/apps/files_textviewer/appinfo/info.xml +++ b/apps/files_textviewer/appinfo/info.xml @@ -6,4 +6,5 @@ AGPL Robin Appelman 2 + diff --git a/apps/media/appinfo/info.xml b/apps/media/appinfo/info.xml index 044abade53f..795c9a4dd71 100644 --- a/apps/media/appinfo/info.xml +++ b/apps/media/appinfo/info.xml @@ -7,4 +7,5 @@ AGPL Robin Appelman 2 - \ No newline at end of file + + diff --git a/apps/user_openid/appinfo/info.xml b/apps/user_openid/appinfo/info.xml index 32525009d61..332d2199dd3 100644 --- a/apps/user_openid/appinfo/info.xml +++ b/apps/user_openid/appinfo/info.xml @@ -7,4 +7,5 @@ AGPL Robin Appelman 2 - \ No newline at end of file + + diff --git a/lib/installer.php b/lib/installer.php index 9416a42c972..0febb2cab46 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -243,13 +243,14 @@ class OC_Installer{ * If $enabled is true, apps are installed as enabled. * If $enabled is false, apps are installed as disabled. */ - public static function installShippedApps( $enabled ){ + public static function installShippedApps(){ $dir = opendir( OC::$SERVERROOT."/apps" ); while( false !== ( $filename = readdir( $dir ))){ if( substr( $filename, 0, 1 ) != '.' and is_dir(OC::$SERVERROOT."/apps/$filename") ){ if( file_exists( OC::$SERVERROOT."/apps/$filename/appinfo/app.php" )){ if(!OC_Installer::isInstalled($filename)){ - OC_Installer::installShippedApp($filename); + $info = OC_Installer::installShippedApp($filename); + $enabled = isset($info['default_enable']); if( $enabled ){ OC_Appconfig::setValue($filename,'enabled','yes'); }else{ @@ -265,7 +266,7 @@ class OC_Installer{ /** * install an app already placed in the app folder * @param string $app id of the app to install - * @return bool + * @returns array see OC_App::getAppInfo */ public static function installShippedApp($app){ //install the database @@ -279,5 +280,6 @@ class OC_Installer{ } $info=OC_App::getAppInfo(OC::$SERVERROOT."/apps/$app/appinfo/info.xml"); OC_Appconfig::setValue($app,'installed_version',$info['version']); + return $info; } } diff --git a/lib/setup.php b/lib/setup.php index 7b205acd705..8d3079720cc 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -206,7 +206,7 @@ class OC_Setup { OC_User::login($username, $password); //guess what this does - OC_Installer::installShippedApps(true); + OC_Installer::installShippedApps(); //create htaccess files for apache hosts if (strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) { From 8c405a59d80898b56e411f40bfb07456f910cc49 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Wed, 28 Sep 2011 23:28:14 +0200 Subject: [PATCH 4/9] little bug fixes in calendar app --- apps/calendar/ajax/neweventform.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/apps/calendar/ajax/neweventform.php b/apps/calendar/ajax/neweventform.php index 7a4c6f469e5..7099ea718e9 100644 --- a/apps/calendar/ajax/neweventform.php +++ b/apps/calendar/ajax/neweventform.php @@ -29,6 +29,9 @@ if($starttime != 'undefined' && !is_nan($starttime) && !$allday){ $startminutes = '00'; }else{ $starttime = date('H'); + if(strlen($starttime) == 2 && $starttime <= 9){ + $starttime = substr($starttime, 1, 1); + } $startminutes = date('i'); } @@ -38,7 +41,18 @@ $endyear = $startyear; $endtime = $starttime; $endminutes = $startminutes; if($endtime == 23) { - $endday++; + if($startday == date(t, mktime($starttime, $startminutes, 0, $startmonth, $startday, $startyear))){ + $datetimestamp = mktime(0, 0, 0, $startmonth, $startday, $startyear); + $datetimestamp = $datetimestamp + 86400; + $endmonth = date("m", $datetimestamp); + $endday = date("d", $datetimestamp); + $endyear = date("Y", $datetimestamp); + }else{ + $endday++; + if($endday <= 9){ + $endday = "0" . $endday; + } + } $endtime = 0; } else { $endtime++; From fbada56054c46a8126e59f1ced5e24d098ebde41 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Wed, 28 Sep 2011 11:44:36 +0200 Subject: [PATCH 5/9] fix url --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 4ad4f82f304..60b18defd59 100644 --- a/README +++ b/README @@ -4,7 +4,7 @@ It is alpha software in development and should be treated accordingly. http://ownCloud.org -Installation instructions: http://owncloud.org/index.php/Installation +Installation instructions: http://owncloud.org/install Source code: http://gitorious.org/owncloud Mailing list: http://mail.kde.org/mailman/listinfo/owncloud From 40b47defcb2db807834d524fe208b0f13a287bf0 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Wed, 28 Sep 2011 11:44:46 +0200 Subject: [PATCH 6/9] enhance errormessages on setup --- lib/util.php | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/lib/util.php b/lib/util.php index c7a2c509800..1ab84569174 100644 --- a/lib/util.php +++ b/lib/util.php @@ -24,7 +24,7 @@ class OC_Util { $success=@mkdir($CONFIG_DATADIRECTORY_ROOT); if(!$success) { $tmpl = new OC_Template( '', 'error', 'guest' ); - $tmpl->assign('errors',array(1=>array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY_ROOT.")",'hint'=>"You can usually fix this by setting the owner of '".OC::$SERVERROOT."' to the user that the web server uses (".exec('whoami').")"))); + $tmpl->assign('errors',array(1=>array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY_ROOT.")",'hint'=>"You can usually fix this by setting the owner of '".OC::$SERVERROOT."' to the user that the web server uses (".OC_Util::checkWebserverUser().")"))); $tmpl->printPage(); exit; } @@ -200,28 +200,21 @@ class OC_Util { } $CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" ); $CONFIG_DBNAME = OC_Config::getValue( "dbname", "owncloud" ); - - //try to get the username the httpd server runs on, used in hints - $stat=stat($_SERVER['DOCUMENT_ROOT']); - if(is_callable('posix_getpwuid')){ - $serverUser=posix_getpwuid($stat['uid']); - $serverUser='\''.$serverUser['name'].'\''; - }else{ - $serverUser='\'www-data\' for ubuntu/debian';//TODO: try to detect the distro and give a guess based on that - } + $serverUser=OC_Util::checkWebserverUser(); //common hint for all file permissons error messages $permissionsHint="Permissions can usually be fixed by setting the owner of the file or directory to the user the web server runs as ($serverUser)"; //check for correct file permissions if(!stristr(PHP_OS, 'WIN')){ + $permissionsModHint="Please change the permissions to 0770 so that the directory cannot be listed by other users."; $prems=substr(decoct(@fileperms($CONFIG_DATADIRECTORY_ROOT)),-3); if(substr($prems,-1)!='0'){ OC_Helper::chmodr($CONFIG_DATADIRECTORY_ROOT,0770); clearstatcache(); $prems=substr(decoct(@fileperms($CONFIG_DATADIRECTORY_ROOT)),-3); if(substr($prems,2,1)!='0'){ - $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') is readable from the web
','hint'=>$permissionsHint); + $errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY_ROOT.') is readable for other users
','hint'=>$permissionsModHint); } } if( OC_Config::getValue( "enablebackup", false )){ @@ -231,7 +224,7 @@ class OC_Util { clearstatcache(); $prems=substr(decoct(@fileperms($CONFIG_BACKUPDIRECTORY)),-3); if(substr($prems,2,1)!='0'){ - $errors[]=array('error'=>'Data directory ('.$CONFIG_BACKUPDIRECTORY.') is readable from the web
','hint'=>$permissionsHint); + $errors[]=array('error'=>'Data directory ('.$CONFIG_BACKUPDIRECTORY.') is readable for other users
','hint'=>$permissionsModHint); } } } @@ -254,6 +247,24 @@ class OC_Util { return $errors; } + + /** + * Try to get the username the httpd server runs on, used in hints + */ + public static function checkWebserverUser(){ + $stat=stat($_SERVER['DOCUMENT_ROOT']); + if(is_callable('posix_getpwuid')){ + $serverUser=posix_getpwuid($stat['uid']); + $serverUser='\''.$serverUser['name'].'\''; + }elseif(exec('whoami')){ + $serverUser=exec('whoami'); + }else{ + $serverUser='\'www-data\' for ubuntu/debian'; //TODO: try to detect the distro and give a guess based on that + } + return $serverUser; + } + + /** * Check if the user is logged in, redirects to home if not */ From b178310a82e5887f4e093b3132e2f6954024a4fe Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Wed, 28 Sep 2011 11:45:04 +0200 Subject: [PATCH 7/9] ignore netbeans folder --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 33f8e0c524b..e9dbc1e3f62 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ RCS/* # eclipse .project .settings + +# netbeans +nbproject From e30220e2874799effac365071a1d9c4975e42102 Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Wed, 28 Sep 2011 11:45:22 +0200 Subject: [PATCH 8/9] media app: show current song, add margin, enable tooltip --- apps/media/css/music.css | 8 ++++++-- apps/media/js/music.js | 3 ++- apps/media/js/player.js | 3 +++ apps/media/js/playlist.js | 2 ++ apps/media/templates/music.php | 1 + 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/apps/media/css/music.css b/apps/media/css/music.css index ddfe3429830..c4db4e05855 100644 --- a/apps/media/css/music.css +++ b/apps/media/css/music.css @@ -9,8 +9,9 @@ div.jp-progress { position:absolute; overflow:hidden; top:.5em; left:8em; width: div.jp-seek-bar { background:#eee; width:0; height:100%; cursor:pointer; } div.jp-play-bar { background:#ccc; width:0; height:100%; } div.jp-seeking-bg { background:url("../img/pbar-ani.gif"); } -div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:1em; left:13.5em; } -div.jp-duration { left:33em; } +div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:0.9em; left:13.5em; } +div.jp-duration { display: none } +div.jp-current-song { left: 33em; position: absolute; top: 0.9em; } div.jp-duration { text-align:right; } a.jp-mute,a.jp-unmute { left:24em; } @@ -21,9 +22,11 @@ div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; } #collection li.album,#collection li.song { margin-left:3em; } #leftcontent img.remove { display:none; float:right; cursor:pointer; } #leftcontent li:hover img.remove { display:inline; } +#leftcontent li {white-space: normal; } #collection li button { float:right; } #collection li,#playlist li { list-style-type:none; } .template { display:none; } +.collection_playing { background:#eee; } #collection li { padding-right:10px; } #searchresults input.play, #searchresults input.add { float:left; height:1em; width:1em; } @@ -34,6 +37,7 @@ tr td { border-top:1px solid #eee; height:2.2em; } tr .artist img { vertical-align:middle; } tr.album td.artist { padding-left:1em; } tr.song td.artist { padding-left:2em; } +.add {margin: 0 0.5em 0 0; } #scan { position:absolute; right:13em; top:0em; } #scan .start { position:relative; display:inline; float:right; } diff --git a/apps/media/js/music.js b/apps/media/js/music.js index c04c579d1ca..cac16ac6ff7 100644 --- a/apps/media/js/music.js +++ b/apps/media/js/music.js @@ -15,7 +15,7 @@ $(document).ready(function(){ PlayList.play(oldSize); PlayList.render(); }); - var button=$(''); + var button=$(''); button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')') button.click(function(event){ event.stopPropagation(); @@ -24,6 +24,7 @@ $(document).ready(function(){ }); row.find('div.name').append(button); } + $('.add').tipsy({gravity:'n', fade:true, delayIn: 400, live:true}); Collection.display(); }); diff --git a/apps/media/js/player.js b/apps/media/js/player.js index f696b87bbde..693bf2d70bf 100644 --- a/apps/media/js/player.js +++ b/apps/media/js/player.js @@ -39,6 +39,7 @@ var PlayList={ PlayList.init(items[index].type,null); // init calls load that calls play }else{ PlayList.player.jPlayer("setMedia", items[PlayList.current]); + $(".jp-current-song").text(items[PlayList.current].name); items[index].playcount++; PlayList.player.jPlayer("play",time); if(index>0){ @@ -67,6 +68,8 @@ var PlayList={ PlayList.init(items[index].type,null); // init calls load that calls play } } + $(".song").removeClass("collection_playing"); + $(".jp-playlist-" + index).addClass("collection_playing"); }, init:function(type,ready){ if(!PlayList.player){ diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js index cb7f24522a4..c6dc3db2dd4 100644 --- a/apps/media/js/playlist.js +++ b/apps/media/js/playlist.js @@ -5,6 +5,7 @@ PlayList.render=function(){ var item=PlayList.items[i]; var li=$('
  • '); li.append(item.name); + li.attr('class', 'jp-playlist-' + i); var img=$(''); img.click(function(event){ event.stopPropagation(); @@ -18,6 +19,7 @@ PlayList.render=function(){ li.addClass('song'); PlayList.parent.append(li); } + $(".jp-playlist-" + PlayList.current).addClass("collection_playing"); } PlayList.getSelected=function(){ return $('tbody td.name input:checkbox:checked').parent().parent(); diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php index 6c8d740cc13..2af18fb03c9 100644 --- a/apps/media/templates/music.php +++ b/apps/media/templates/music.php @@ -17,6 +17,7 @@ +
    From 0fcd765bd5560b4188c7e424082a4ebc1b2a3694 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Wed, 28 Sep 2011 11:47:29 +0200 Subject: [PATCH 9/9] add check for ctype --- lib/util.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/util.php b/lib/util.php index c7a2c509800..4b75b0808e8 100644 --- a/lib/util.php +++ b/lib/util.php @@ -250,6 +250,9 @@ class OC_Util { if(!function_exists('mb_detect_encoding')){ $errors[]=array('error'=>'PHP module mb multibyte not installed.
    ','hint'=>'Please ask your server administrator to install the module.'); } + if(!function_exists('ctype_digit')){ + $errors[]=array('error'=>'PHP module ctype is not installed.
    ','hint'=>'Please ask your server administrator to install the module.'); + } return $errors; }