Skip to content
Snippets Groups Projects
Commit c0e7cf2e authored by Robin Appelman's avatar Robin Appelman
Browse files

remove now useless 'media' entry from settings

parent c814f10d
No related branches found
No related tags found
No related merge requests found
...@@ -84,13 +84,6 @@ if($arguments['action']){ ...@@ -84,13 +84,6 @@ if($arguments['action']){
OC_DB::beginTransaction(); OC_DB::beginTransaction();
set_time_limit(0); //recursive scan can take a while set_time_limit(0); //recursive scan can take a while
$path=$arguments['path']; $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); echo OC_MEDIA_SCANNER::scanFolder($path);
OC_DB::commit(); OC_DB::commit();
flush(); flush();
......
...@@ -27,7 +27,6 @@ OC_Util::addScript('media','loader'); ...@@ -27,7 +27,6 @@ OC_Util::addScript('media','loader');
OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' )); 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::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 // add subnavigations
$entry = array( $entry = array(
......
<?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();
?>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment