diff options
64 files changed, 102 insertions, 71 deletions
diff --git a/3rdparty/Crypt_Blowfish/Blowfish.php b/3rdparty/Crypt_Blowfish/Blowfish.php index a7b8948f043..4ccacb963e3 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 243ce1798bc..e27fe49c54f 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(); - $('<div class="calendar_share_dropdown"></div>').appendTo('#'+userid+'_'+calid); + var element = document.getElementById(userid+'_'+calid); + $('<div class="calendar_share_dropdown"></div>').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 c14daa258c1..c758a3508c5 100644 --- a/apps/external/ajax/setsites.php +++ b/apps/external/ajax/setsites.php @@ -1,7 +1,7 @@ <?php /** - * Copyright (c) 2011, Frank Karlitschek <karlitschek@kde.org> + * 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 b569fc305ba..ee5437782cd 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 d63be3ad1d5..81819e76e2f 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 b66843556bb..a84216b61b7 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 37eaedc3fc9..ec27900cbc6 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 f12dc618f23..11c07ef86ce 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 e3b13f7e93c..f370e1521e4 100644 --- a/apps/gallery/appinfo/database.xml +++ b/apps/gallery/appinfo/database.xml @@ -31,13 +31,13 @@ <name>album_path</name> <type>text</type> <notnull>true</notnull> - <length>100</length> + <length>256</length> </field> <field> <name>parent_path</name> <type>text</type> <notnull>true</notnull> - <length>100</length> + <length>256</length> </field> </declaration> </table> @@ -63,7 +63,7 @@ <name>file_path</name> <type>text</type> <notnull>true</notnull> - <length>100</length> + <length>256</length> </field> </declaration> </table> diff --git a/apps/gallery/appinfo/version b/apps/gallery/appinfo/version index 2b7c5ae0184..17b2ccd9bf9 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 ab498db07da..7a81c18e0af 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 699b9e9aeec..322d9ed7279 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 a54be37b2e6..ac0e83bb373 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 01aa2220df5..b3ff6c53881 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 d6c1a8ec0ec..ac263ed68c3 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -17,7 +17,7 @@ <p><label for="ldap_port"><?php echo $l->t('Port');?></label><input type="text" id="ldap_port" name="ldap_port" value="<?php echo $_['ldap_port']; ?>" /></p> <p><label for="ldap_base_users"><?php echo $l->t('Base User Tree');?></label><input type="text" id="ldap_base_users" name="ldap_base_users" value="<?php echo $_['ldap_base_users']; ?>" /></p> <p><label for="ldap_base_groups"><?php echo $l->t('Base Group Tree');?></label><input type="text" id="ldap_base_groups" name="ldap_base_groups" value="<?php echo $_['ldap_base_groups']; ?>" /></p> - <p><label for="ldap_group_member_assoc_attribute"><?php echo $l->t('Group-Member association');?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute"><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) echo ' selected'; ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) echo ' selected'; ?>>memberUid</option></select></p> + <p><label for="ldap_group_member_assoc_attribute"><?php echo $l->t('Group-Member association');?></label><select id="ldap_group_member_assoc_attribute" name="ldap_group_member_assoc_attribute"><option value="uniqueMember"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'uniqueMember')) echo ' selected'; ?>>uniqueMember</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'memberUid')) echo ' selected'; ?>>memberUid</option><option value="memberUid"<?php if (isset($_['ldap_group_member_assoc_attribute']) && ($_['ldap_group_member_assoc_attribute'] == 'member')) echo ' selected'; ?>>member (AD)</option></select></p> <p><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1"<?php if ($_['ldap_tls']) echo ' checked'; ?>><label for="ldap_tls"><?php echo $l->t('Use TLS');?></label></p> <p><input type="checkbox" id="ldap_nocase" name="ldap_nocase" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>><label for="ldap_nocase"><?php echo $l->t('Case insensitve LDAP server (Windows)');?></label></p> <p><label for="ldap_display_name"><?php echo $l->t('Display Name Field');?></label><input type="text" id="ldap_display_name" name="ldap_display_name" value="<?php echo $_['ldap_display_name']; ?>" /> diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php index 2b87a1eb111..6a4748588fc 100644 --- a/core/lostpassword/index.php +++ b/core/lostpassword/index.php @@ -1,6 +1,6 @@ <?php /** - * Copyright (c) 2010 Frank Karlitschek karlitschek@kde.org + * Copyright (c) 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/core/lostpassword/resetpassword.php b/core/lostpassword/resetpassword.php index 1c78d720947..33be9d7053b 100644 --- a/core/lostpassword/resetpassword.php +++ b/core/lostpassword/resetpassword.php @@ -1,6 +1,6 @@ <?php /** - * Copyright (c) 2010 Frank Karlitschek karlitschek@kde.org + * Copyright (c) 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/files/webdav.php b/files/webdav.php index 7624ccbbc72..53673dbeca2 100644 --- a/files/webdav.php +++ b/files/webdav.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/index.php b/index.php index 690fc90e752..d552c149df8 100644..100755 --- a/index.php +++ b/index.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 @@ -21,6 +21,7 @@ * */ + $RUNTIME_NOAPPS = TRUE; //no apps, yet require_once('lib/base.php'); diff --git a/lib/app.php b/lib/app.php index 04fc264d11a..78de0fa21b6 100644..100755 --- a/lib/app.php +++ b/lib/app.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 @@ -189,8 +189,16 @@ class OC_App{ } } if($app!==false){ - OC_Appconfig::setValue( $app, 'enabled', 'yes' ); - return true; + // check if the app is compatible with this version of ownCloud + $info=OC_App::getAppInfo($app); + $version=OC_Util::getVersion(); + if(!isset($info['require']) or ($version[0]>$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 5aaaadd9c4a..c6216974dd9 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 f4540853ba4..cc715afac5d 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 ad1cd18fa15..e3a9c11f247 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 08bd06df95e..bcc8657b4a4 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 e0c78d22c24..072de33004f 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 fd6497b9478..d05acd3674d 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 cac7e8648ef..6b3c254c5e9 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 b62bb82c699..d893bd4d3df 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 1e0216a932b..a78eb51fff0 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 af6c53c8035..3b652599462 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 d401acf43b3..af55de1f427 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 5220237ecbf..0825b10708a 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 a88159f91be..b2de119553c 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 31819d2e3fc..e3d292737a4 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 6417ed1c7a8..5c030d2917d 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 c0ecdbd1b70..682e15f0e9b 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 536ee754e84..e28eb61987c 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 aef51f38fb7..33308553be0 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 75201f455ba..89fc73aa232 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 1a46180bb96..3960db6d897 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 762fb6b1800..9f5abe672cb 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 af2e46c9da2..f7564c0bb6a 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 24c0193e8a7..fc3004434ba 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 439721ac6ce..a8554671d10 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 c35c2654965..cc2137c5cae 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 33eefea3b80..b89088bdd06 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 d351b001e8f..a0c069f7379 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 3d20c5a4635..39a185d02a7 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 12055418687..f8a4b8e96eb 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 e908c76bfad..a15cfcc457b 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 deb0f05945e..bc5ee00b6a3 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 056d1307543..ee2a80b1599 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 4afdf152150..3df907226c4 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 894ccffb791..769ba6a7920 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 03d5c3256da..a946d4e6214 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 b6a2091b685..18bc6bce00d 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 e1d6ef7ee1e..397d2f06f5d 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 f5ff6cb6054..77dd75b9fc2 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 028f00c2497..1a829d371a6 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 48fcec32782..f0abed8f558 100644 --- a/settings/help.php +++ b/settings/help.php @@ -1,6 +1,6 @@ <?php /** - * Copyright (c) 2011, Frank Karlitschek karlitschek@kde.org + * 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/settings/js/apps.js b/settings/js/apps.js index 8aa54463b3b..f6e08b608bd 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -41,7 +41,7 @@ $(document).ready(function(){ if(active){ $.post(OC.filePath('settings','ajax','disableapp.php'),{appid:app},function(result){ if(!result || result.status!='success'){ - OC.dialogs.alert('Error','Error while disabling app'); + OC.dialogs.alert('Error while disabling app','Error'); } else { element.data('active',false); @@ -54,7 +54,7 @@ $(document).ready(function(){ }else{ $.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app},function(result){ if(!result || result.status!='success'){ - OC.dialogs.alert('Error','Error while enabling app'); + OC.dialogs.alert('Error while enabling app','Error'); } else { element.data('active',true); diff --git a/settings/templates/help.php b/settings/templates/help.php index f9eb8615972..a53ec76d681 100644 --- a/settings/templates/help.php +++ b/settings/templates/help.php @@ -1,5 +1,5 @@ <?php /** - * Copyright (c) 2011, Frank Karlitschek karlitschek@kde.org + * 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/status.php b/status.php index 81f339fa53f..2d31702ecb3 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 99553fa8ef0..b5fee9bf85f 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 |