diff --git a/3rdparty/Crypt_Blowfish/Blowfish.php b/3rdparty/Crypt_Blowfish/Blowfish.php index a7b8948f04..4ccacb963e 100644 --- a/3rdparty/Crypt_Blowfish/Blowfish.php +++ b/3rdparty/Crypt_Blowfish/Blowfish.php @@ -221,7 +221,7 @@ class Crypt_Blowfish function decrypt($cipherText) { if (!is_string($cipherText)) { - PEAR::raiseError('Chiper text must be a string', 1, PEAR_ERROR_DIE); + PEAR::raiseError('Cipher text must be a string', 1, PEAR_ERROR_DIE); } if (extension_loaded('mcrypt')) { diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index 243ce1798b..e27fe49c54 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -506,10 +506,11 @@ Calendar={ }, dropdown:function(userid, calid){ $('.calendar_share_dropdown').remove(); - $('
').appendTo('#'+userid+'_'+calid); + var element = document.getElementById(userid+'_'+calid); + $('
').appendTo(element); $.get(OC.filePath('calendar', 'ajax/share', 'dropdown.php') + '?calid=' + calid, function(data){ - $('#'+userid+'_'+calid+' > .calendar_share_dropdown').html(data); - $('#'+userid+'_'+calid+' > .calendar_share_dropdown').show('blind'); + $('.calendar_share_dropdown').html(data); + $('.calendar_share_dropdown').show('blind'); $('#share_user').chosen(); $('#share_group').chosen(); }); diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php index c14daa258c..c758a3508c 100644 --- a/apps/external/ajax/setsites.php +++ b/apps/external/ajax/setsites.php @@ -1,7 +1,7 @@ + * 2012 Frank Karlitschek frank@owncloud.org * This file is licensed under the Affero General Public License version 3 or later. * See the COPYING-README file. */ diff --git a/apps/external/appinfo/app.php b/apps/external/appinfo/app.php index b569fc305b..ee5437782c 100644 --- a/apps/external/appinfo/app.php +++ b/apps/external/appinfo/app.php @@ -4,7 +4,7 @@ * ownCloud - External plugin * * @author Frank Karlitschek - * @copyright 2011 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/apps/external/index.php b/apps/external/index.php index d63be3ad1d..81819e76e2 100644 --- a/apps/external/index.php +++ b/apps/external/index.php @@ -4,7 +4,7 @@ * ownCloud - External plugin * * @author Frank Karlitschek - * @copyright 2011 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php index b66843556b..a84216b61b 100644 --- a/apps/files/appinfo/remote.php +++ b/apps/files/appinfo/remote.php @@ -5,7 +5,7 @@ * * @author Frank Karlitschek * @author Jakob Sack - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * @copyright 2011 Jakob Sack kde@jakobsack.de * * This library is free software; you can redistribute it and/or diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php index 37eaedc3fc..ec27900cbc 100644 --- a/apps/files_encryption/lib/crypt.php +++ b/apps/files_encryption/lib/crypt.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php index f12dc618f2..11c07ef86c 100644 --- a/apps/files_versions/history.php +++ b/apps/files_versions/history.php @@ -4,7 +4,7 @@ * ownCloud - History page of the Versions App * * @author Frank Karlitschek - * @copyright 2011 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/apps/gallery/appinfo/database.xml b/apps/gallery/appinfo/database.xml index e3b13f7e93..f370e1521e 100644 --- a/apps/gallery/appinfo/database.xml +++ b/apps/gallery/appinfo/database.xml @@ -31,13 +31,13 @@ album_path text true - 100 + 256 parent_path text true - 100 + 256 @@ -63,7 +63,7 @@ file_path text true - 100 + 256 diff --git a/apps/gallery/appinfo/version b/apps/gallery/appinfo/version index 2b7c5ae018..17b2ccd9bf 100644 --- a/apps/gallery/appinfo/version +++ b/apps/gallery/appinfo/version @@ -1 +1 @@ -0.4.2 +0.4.3 diff --git a/apps/remoteStorage/WebDAV.php b/apps/remoteStorage/WebDAV.php index ab498db07d..7a81c18e0a 100644 --- a/apps/remoteStorage/WebDAV.php +++ b/apps/remoteStorage/WebDAV.php @@ -5,7 +5,7 @@ * * Original: * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * Adapted: * @author Michiel de Jong, 2011 diff --git a/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php index 699b9e9aee..322d9ed727 100644 --- a/apps/remoteStorage/ajax/revokeToken.php +++ b/apps/remoteStorage/ajax/revokeToken.php @@ -5,7 +5,7 @@ * * Original: * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * Adapted: * @author Michiel de Jong, 2012 diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php index a54be37b2e..ac0e83bb37 100644 --- a/apps/remoteStorage/auth.php +++ b/apps/remoteStorage/auth.php @@ -5,7 +5,7 @@ * * Original: * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * Adapted: * @author Michiel de Jong, 2012 diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 01aa2220df..b3ff6c5388 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -85,7 +85,8 @@ class OC_GROUP_LDAP extends OC_Group_Backend { } //uniqueMember takes DN, memberuid the uid, so we need to distinguish - if(strtolower($this->ldapGroupMemberAssocAttr) == 'uniquemember') { + if((strtolower($this->ldapGroupMemberAssocAttr) == 'uniquemember') + || (strtolower($this->ldapGroupMemberAssocAttr) == 'member')) { $uid = $userDN; } else if(strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid') { $result = OC_LDAP::readAttribute($userDN, 'uid'); diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index d6c1a8ec0e..ac263ed68c 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -17,7 +17,7 @@

-

+

>

>

diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php index 2b87a1eb11..6a4748588f 100644 --- a/core/lostpassword/index.php +++ b/core/lostpassword/index.php @@ -1,6 +1,6 @@ $info['require'])){ + OC_Log::write('core','App "'.$info['name'].'" can\'t be installed because it is not compatible with this version of ownCloud',OC_Log::ERROR); + return false; + }else{ + OC_Appconfig::setValue( $app, 'enabled', 'yes' ); + return true; + } }else{ return false; } @@ -517,6 +525,26 @@ class OC_App{ } } } + + // check if the current enabled apps are compatible with the current ownCloud version. disable them if not. + // this is important if you upgrade ownCloud and have non ported 3rd party apps installed + $apps =OC_App::getEnabledApps(); + $version=OC_Util::getVersion(); + foreach($apps as $app) { + + // check if the app is compatible with this version of ownCloud + $info=OC_App::getAppInfo($app); + if(!isset($info['require']) or ($version[0]>$info['require'])){ + OC_Log::write('core','App "'.$info['name'].'" can\'t be used because it is not compatible with this version of ownCloud',OC_Log::ERROR); + OC_App::disable( $app ); + } + + + + } + + + } /** diff --git a/lib/appconfig.php b/lib/appconfig.php index 5aaaadd9c4..c6216974dd 100644 --- a/lib/appconfig.php +++ b/lib/appconfig.php @@ -4,7 +4,7 @@ * * @author Frank Karlitschek * @author Jakob Sack - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/base.php b/lib/base.php index f4540853ba..cc715afac5 100644 --- a/lib/base.php +++ b/lib/base.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/config.php b/lib/config.php index ad1cd18fa1..e3a9c11f24 100644 --- a/lib/config.php +++ b/lib/config.php @@ -4,7 +4,7 @@ * * @author Frank Karlitschek * @author Jakob Sack - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/db.php b/lib/db.php index 08bd06df95..bcc8657b4a 100644 --- a/lib/db.php +++ b/lib/db.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/files.php b/lib/files.php index e0c78d22c2..072de33004 100644 --- a/lib/files.php +++ b/lib/files.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/filestorage.php b/lib/filestorage.php index fd6497b947..d05acd3674 100644 --- a/lib/filestorage.php +++ b/lib/filestorage.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/filesystem.php b/lib/filesystem.php index cac7e8648e..6b3c254c5e 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/filesystemview.php b/lib/filesystemview.php index b62bb82c69..d893bd4d3d 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/group.php b/lib/group.php index 1e0216a932..a78eb51fff 100644 --- a/lib/group.php +++ b/lib/group.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/group/backend.php b/lib/group/backend.php index af6c53c803..3b65259946 100644 --- a/lib/group/backend.php +++ b/lib/group/backend.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/group/database.php b/lib/group/database.php index d401acf43b..af55de1f42 100644 --- a/lib/group/database.php +++ b/lib/group/database.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/group/dummy.php b/lib/group/dummy.php index 5220237ecb..0825b10708 100644 --- a/lib/group/dummy.php +++ b/lib/group/dummy.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/group/example.php b/lib/group/example.php index a88159f91b..b2de119553 100644 --- a/lib/group/example.php +++ b/lib/group/example.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/helper.php b/lib/helper.php index 31819d2e3f..e3d292737a 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -4,7 +4,7 @@ * * @author Frank Karlitschek * @author Jakob Sack - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/installer.php b/lib/installer.php index 6417ed1c7a..5c030d2917 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -3,7 +3,7 @@ * ownCloud * * @author Robin Appelman - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/l10n.php b/lib/l10n.php index c0ecdbd1b7..682e15f0e9 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -3,7 +3,7 @@ * ownCloud * * @author Jakob Sack - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/ocs.php b/lib/ocs.php index 536ee754e8..e28eb61987 100644 --- a/lib/ocs.php +++ b/lib/ocs.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/ocsclient.php b/lib/ocsclient.php index aef51f38fb..33308553be 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -4,7 +4,7 @@ * * @author Frank Karlitschek * @author Jakob Sack - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/preferences.php b/lib/preferences.php index 75201f455b..89fc73aa23 100644 --- a/lib/preferences.php +++ b/lib/preferences.php @@ -4,7 +4,7 @@ * * @author Frank Karlitschek * @author Jakob Sack - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/app.php b/lib/public/app.php index 1a46180bb9..3960db6d89 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/config.php b/lib/public/config.php index 762fb6b180..9f5abe672c 100644 --- a/lib/public/config.php +++ b/lib/public/config.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/db.php b/lib/public/db.php index af2e46c9da..f7564c0bb6 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/files.php b/lib/public/files.php index 24c0193e8a..fc3004434b 100644 --- a/lib/public/files.php +++ b/lib/public/files.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/json.php b/lib/public/json.php index 439721ac6c..a8554671d1 100644 --- a/lib/public/json.php +++ b/lib/public/json.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/response.php b/lib/public/response.php index c35c265496..cc2137c5ca 100644 --- a/lib/public/response.php +++ b/lib/public/response.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/template.php b/lib/public/template.php index 33eefea3b8..b89088bdd0 100644 --- a/lib/public/template.php +++ b/lib/public/template.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/user.php b/lib/public/user.php index d351b001e8..a0c069f737 100644 --- a/lib/public/user.php +++ b/lib/public/user.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/public/util.php b/lib/public/util.php index 3d20c5a463..39a185d02a 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/search.php b/lib/search.php index 1205541868..f8a4b8e96e 100644 --- a/lib/search.php +++ b/lib/search.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/template.php b/lib/template.php index e908c76bfa..a15cfcc457 100644 --- a/lib/template.php +++ b/lib/template.php @@ -4,7 +4,7 @@ * * @author Frank Karlitschek * @author Jakob Sack - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/updater.php b/lib/updater.php index deb0f05945..bc5ee00b6a 100644 --- a/lib/updater.php +++ b/lib/updater.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/user.php b/lib/user.php index 056d130754..ee2a80b159 100644 --- a/lib/user.php +++ b/lib/user.php @@ -3,7 +3,7 @@ * ownCloud * * @author Frank Karlitschek - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/user/backend.php b/lib/user/backend.php index 4afdf15215..3df907226c 100644 --- a/lib/user/backend.php +++ b/lib/user/backend.php @@ -5,7 +5,7 @@ * * @author Frank Karlitschek * @author Dominik Schmidt - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * @copyright 2011 Dominik Schmidt dev@dominik-schmidt.de * * This library is free software; you can redistribute it and/or diff --git a/lib/user/database.php b/lib/user/database.php index 894ccffb79..769ba6a792 100644 --- a/lib/user/database.php +++ b/lib/user/database.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/user/dummy.php b/lib/user/dummy.php index 03d5c3256d..a946d4e621 100644 --- a/lib/user/dummy.php +++ b/lib/user/dummy.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/lib/user/example.php b/lib/user/example.php index b6a2091b68..18bc6bce00 100644 --- a/lib/user/example.php +++ b/lib/user/example.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek - * @copyright 2010 Frank Karlitschek karlitschek@kde.org + * @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/ocs/providers.php b/ocs/providers.php index e1d6ef7ee1..397d2f06f5 100644 --- a/ocs/providers.php +++ b/ocs/providers.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/ocs/v1.php b/ocs/v1.php index f5ff6cb605..77dd75b9fc 100644 --- a/ocs/v1.php +++ b/ocs/v1.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/settings/apps.php b/settings/apps.php index 028f00c249..1a829d371a 100644 --- a/settings/apps.php +++ b/settings/apps.php @@ -4,7 +4,7 @@ * ownCloud * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/settings/help.php b/settings/help.php index 48fcec3278..f0abed8f55 100644 --- a/settings/help.php +++ b/settings/help.php @@ -1,6 +1,6 @@ diff --git a/status.php b/status.php index 81f339fa53..2d31702ecb 100644 --- a/status.php +++ b/status.php @@ -4,7 +4,7 @@ * ownCloud status page. usefull if you want to check from the outside if an owncloud installation exists * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE diff --git a/webapps.php b/webapps.php index 99553fa8ef..b5fee9bf85 100644 --- a/webapps.php +++ b/webapps.php @@ -4,7 +4,7 @@ * ownCloud status page. usefull if you want to check from the outside if an owncloud installation exists * * @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org +* @copyright 2012 Frank Karlitschek frank@owncloud.org * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE