Fixup use of OC_Helper::linkTo function

diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 425c93c7338eb2be0e200297ea0e6e87fcd5a681..0016751a66ad1166e17651b228a97967cb04db2e 100644 (file)
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -36,7 +36,7 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{
                                        }else{
                                                $info = $l->t('Date') . ': ' . $start_dt->format('d.m.y H:i') . ' - ' . $end_dt->format('d.m.y H:i');
                                        }
-                                       $link = OC_Helper::linkTo('apps/calendar', 'index.php?showevent='.urlencode($object['id']));
+                                       $link = OC_Helper::linkTo('calendar', 'index.php').'?showevent='.urlencode($object['id']);
                                        $results[]=new OC_Search_Result($object['summary'],$info, $link,$l->t('Cal.'));//$name,$text,$link,$type
                                }
                        }

diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
index 97638821007a88d2a20aa6e2af43df226d9fa7ce..5aad6a25f09535c1d515a78666e7b649023ff0a9 100644 (file)
--- a/apps/contacts/lib/search.php
+++ b/apps/contacts/lib/search.php
@@ -18,7 +18,7 @@ class OC_Search_Provider_Contacts extends OC_Search_Provider{
                        $vcards = OC_Contacts_VCard::all($addressbook['id']);
                        foreach($vcards as $vcard){
                                if(substr_count(strtolower($vcard['fullname']), strtolower($query)) > 0){
-                                       $link = OC_Helper::linkTo('apps/contacts', 'index.php?id='.urlencode($vcard['id']));
+                                       $link = OC_Helper::linkTo('contacts', 'index.php').'?id='.urlencode($vcard['id']);
                                        $results[]=new OC_Search_Result($vcard['fullname'],'', $link,$l->t('Contact'));//$name,$text,$link,$type
                                }
                        }

diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index da8722744972107f8a26b0686624a012b40bc36a..b8de32ea58795826c07f8df397e203791a96e435 100644 (file)
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -46,7 +46,7 @@ OC_App::addNavigationEntry( array(
                $result = $stmt->execute(array(OC_User::getUser(),'%'.$query.'%'));
                $results=array();
                while($row=$result->fetchRow()){
-                       $results[]=new OC_Search_Result($row['album_name'],'',OC_Helper::linkTo('apps/gallery', 'index.php?view='.$row['album_name']),'Galleries');
+                       $results[]=new OC_Search_Result($row['album_name'],'',OC_Helper::linkTo('gallery', 'index.php').'?view='.$row['album_name'],'Galleries');
                }
                return $results;
        }

diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 0ade0e593dc2216ddc8b2b9e23837795050d74d8..1bcd0f08c80d228e09535f3e5bc11f08fa8a769c 100644 (file)
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -89,18 +89,18 @@ class OC_MediaSearchProvider extends OC_Search_Provider{
                $songs=OC_MEDIA_COLLECTION::getSongs(0,0,$query);
                $results=array();
                foreach($artists as $artist){
-                       $results[]=new OC_Search_Result($artist['artist_name'],'',OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist['artist_name']) ),'Music');
+                       $results[]=new OC_Search_Result($artist['artist_name'],'',OC_Helper::linkTo( 'media', 'index.php').'#artist='.urlencode($artist['artist_name']),'Music');
                }
                foreach($albums as $album){
                        $artist=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']);
-                       $results[]=new OC_Search_Result($album['album_name'],'by '.$artist,OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist).'&album='.urlencode($album['album_name']) ),'Music');
+                       $results[]=new OC_Search_Result($album['album_name'],'by '.$artist,OC_Helper::linkTo( 'media', 'index.php').'#artist='.urlencode($artist).'&album='.urlencode($album['album_name']),'Music');
                }
                foreach($songs as $song){
                        $minutes=floor($song['song_length']/60);
                        $secconds=$song['song_length']%60;
                        $artist=OC_MEDIA_COLLECTION::getArtistName($song['song_artist']);
                        $album=OC_MEDIA_COLLECTION::getalbumName($song['song_album']);
-                       $results[]=new OC_Search_Result($song['song_name'],"by $artist, in $album $minutes:$secconds",OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist).'&album='.urlencode($album).'&song='.urlencode($song['song_name']) ),'Music');
+                       $results[]=new OC_Search_Result($song['song_name'],"by $artist, in $album $minutes:$secconds",OC_Helper::linkTo( 'media', 'index.php').'#artist='.urlencode($artist).'&album='.urlencode($album).'&song='.urlencode($song['song_name']),'Music');
                }
                return $results;
        }

diff --git a/files/index.php b/files/index.php
index f166790ba9c642a317c249e6d7c11322aed753fa..a29d3fb7e1e5a65ac9dc0788549a08120b5bfcbb 100644 (file)
--- a/files/index.php
+++ b/files/index.php
@@ -76,11 +76,11 @@ foreach( explode( "/", $dir ) as $i ){
 // make breadcrumb und filelist markup
 $list = new OC_Template( "files", "part.list", "" );
 $list->assign( "files", $files );
-$list->assign( "baseURL", OC_Helper::linkTo("files", "index.php?dir="));
-$list->assign( "downloadURL", OC_Helper::linkTo("files", "download.php?file="));
+$list->assign( "baseURL", OC_Helper::linkTo("files", "index.php")."?dir=");
+$list->assign( "downloadURL", OC_Helper::linkTo("files", "download.php")."?file=");
 $breadcrumbNav = new OC_Template( "files", "part.breadcrumb", "" );
 $breadcrumbNav->assign( "breadcrumb", $breadcrumb );
-$breadcrumbNav->assign( "baseURL", OC_Helper::linkTo("files", "index.php?dir="));
+$breadcrumbNav->assign( "baseURL", OC_Helper::linkTo("files", "index.php")."?dir=");
 
 $upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
 $post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));

diff --git a/lib/app.php b/lib/app.php
index 22d18b17eec291258b0def00a7ca62c4472847c0..1879a89cee34d6228ad938dd0b65455d825f99ce 100644 (file)
--- a/lib/app.php
+++ b/lib/app.php
@@ -230,7 +230,7 @@ class OC_App{
                                // admin users menu
                                $settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" ));
                                // admin apps menu
-                               $settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));
+                               $settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php" ).'?installed', "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));
                                // admin log menu
                                $settings[] = array( "id" => "core_log", "order" => 4, "href" => OC_Helper::linkTo( "settings", "log.php" ), "name" => $l->t("Log"), "icon" => OC_Helper::imagePath( "settings", "log.svg" ));
 

diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index c3dc2942aef43cbabc6bfddb3364191e7212b35f..34803c75aeba18a32dc88f94fb8e4b506739e9a7 100644 (file)
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -7,7 +7,7 @@ class OC_Search_Provider_File extends OC_Search_Provider{
                foreach($files as $fileData){
                        $file=$fileData['path'];
                        if($fileData['mime']=='httpd/unix-directory'){
-                               $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php?dir='.$file ),'Files');
+                               $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php' ).'?dir='.$file,'Files');
                        }else{
                                $mime=$fileData['mime'];
                                $mimeBase=$fileData['mimepart'];
@@ -15,16 +15,16 @@ class OC_Search_Provider_File extends OC_Search_Provider{
                                        case 'audio':
                                                break;
                                        case 'text':
-                                               $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Text');
+                                               $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Text');
                                                break;
                                        case 'image':
-                                               $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Images');
+                                               $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Images');
                                                break;
                                        default:
                                                if($mime=='application/xml'){
-                                                       $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Text');
+                                                       $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Text');
                                                }else{
-                                                       $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Files');
+                                                       $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Files');
                                                }
                                }
                        }