diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/media/ajax/api.php | 7 | ||||
| -rw-r--r-- | apps/media/appinfo/app.php | 1 | ||||
| -rw-r--r-- | apps/media/settings.php | 52 |
3 files changed, 0 insertions, 60 deletions
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php index 60458167a96..8fcabbf840e 100644 --- a/apps/media/ajax/api.php +++ b/apps/media/ajax/api.php @@ -84,13 +84,6 @@ if($arguments['action']){ OC_DB::beginTransaction(); set_time_limit(0); //recursive scan can take a while $path=$arguments['path']; - if(OC_Filesystem::is_dir($path)){ - $paths=explode(PATH_SEPARATOR,OC_Preferences::getValue(OC_User::getUser(),'media','paths','')); - if(array_search($path,$paths)===false){ - $paths[]=$path; - OC_Preferences::setValue(OC_User::getUser(),'media','paths',implode(PATH_SEPARATOR,$paths)); - } - } echo OC_MEDIA_SCANNER::scanFolder($path); OC_DB::commit(); flush(); diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php index 20c58689f09..fde005fe745 100644 --- a/apps/media/appinfo/app.php +++ b/apps/media/appinfo/app.php @@ -27,7 +27,6 @@ OC_Util::addScript('media','loader'); OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' )); OC_App::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo( 'media', 'index.php' ), 'icon' => OC_Helper::imagePath( 'media', 'media.png' ), 'name' => 'Media' )); -OC_App::addSettingsPage( array( 'id' => 'media_settings', 'order' => 5, 'href' => OC_Helper::linkTo( 'media', 'settings.php' ), 'name' => 'Media', 'icon' => OC_Helper::imagePath( 'media', 'media.png' ))); // add subnavigations $entry = array( diff --git a/apps/media/settings.php b/apps/media/settings.php deleted file mode 100644 index 0563bc38fb3..00000000000 --- a/apps/media/settings.php +++ /dev/null @@ -1,52 +0,0 @@ -<?php - -/** -* ownCloud - media plugin -* -* @author Robin Appelman -* @copyright 2010 Robin Appelman icewind1991@gmail.com -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - - -require_once('../../lib/base.php'); - -if( !OC_User::isLoggedIn()){ - header( "Location: ".OC_Helper::linkTo( "index.php" )); - exit(); -} - -require( 'lib_collection.php' ); - -OC_Util::addStyle('media','style'); -OC_Util::addScript('media','settings'); - -OC_App::setActiveNavigationEntry( 'media_settings' ); - -$folderNames=explode(PATH_SEPARATOR,OC_Preferences::getValue($_SESSION['user_id'],'media','paths','')); -$folders=array(); -foreach($folderNames as $folder){ - if($folder){ - $folders[]=array('name'=>$folder,'songs'=>OC_MEDIA_COLLECTION::getSongCountByPath($folder)); - } -} - -$tmpl = new OC_Template( 'media', 'settings', 'admin' ); -$tmpl->assign('folders',$folders); -$tmpl->assign('autoupdate',OC_Preferences::getValue($_SESSION['user_id'],'media','autoupdate',false)); -$tmpl->printPage(); -?> - |