From a8e625f47a8b197f6cb89b67f37ef5d0a756619d Mon Sep 17 00:00:00 2001
From: Sem <sembrestels@riseup.net>
Date: Thu, 3 Nov 2011 20:37:47 +0100
Subject: Removed all $CONFIG and pg/ appearitions.

---
 views/default/forms/browsetube.php                 |  6 +++---
 views/default/object/videolist.php                 | 10 ++++------
 views/default/staticvideo/index.php                |  2 +-
 views/default/videolist/group_video_header.php     |  4 ++--
 views/default/videolist/groupprofile_videolist.php | 10 +++++-----
 views/default/videolist/icon.php                   |  8 +++-----
 6 files changed, 18 insertions(+), 22 deletions(-)

(limited to 'views/default')

diff --git a/views/default/forms/browsetube.php b/views/default/forms/browsetube.php
index 82201a81c..bbe2b8935 100644
--- a/views/default/forms/browsetube.php
+++ b/views/default/forms/browsetube.php
@@ -42,13 +42,13 @@ if(isset($confirm_action) && ($confirm_action == 'search_video')) {
 $body .= "<div class='elgg_horizontal_tabbed_nav margin_top'>";
 $body .= 		"<ul id='videonav'>";
 $body .= 			"<li class='selected' id='YT'>";
-$body .= 				"<a href=\"".$vars['url']."pg/videolist/browse/".$getcontainer_guid."?q=youtube\">YouTube</a>";
+$body .= 				"<a href=\"".$vars['url']."videolist/browse/".$getcontainer_guid."?q=youtube\">YouTube</a>";
 $body .= 			"</li>";
 $body .= 			"<li id='MC'>";
-$body .= 				"<a href=\"".$vars['url']."pg/videolist/browse/".$getcontainer_guid."?q=metacafe\">Metacafe</a>";
+$body .= 				"<a href=\"".$vars['url']."videolist/browse/".$getcontainer_guid."?q=metacafe\">Metacafe</a>";
 $body .= 			"</li>";
 $body .= 			"<li id='VM'>";
-$body .= 				"<a href=\"".$vars['url']."pg/videolist/browse/".$getcontainer_guid."?q=vimeo\">Vimeo</a>";
+$body .= 				"<a href=\"".$vars['url']."videolist/browse/".$getcontainer_guid."?q=vimeo\">Vimeo</a>";
 $body .= 			"</li>";
 $body .= 		"</ul>";
 $body .= "</div>";
diff --git a/views/default/object/videolist.php b/views/default/object/videolist.php
index 82336ec97..d67d35b23 100644
--- a/views/default/object/videolist.php
+++ b/views/default/object/videolist.php
@@ -6,8 +6,6 @@
 /* @copyright Prateek.Choudhary
 /*****************************************************************************************/
 
-global $CONFIG;
-
 $video_file = $vars['entity'];
 
 if(!empty($video_file)) {
@@ -22,7 +20,7 @@ if(!empty($video_file)) {
 
 	$mime = "image/html";
 	$thumbnail = $videothumbnail;
-	$watch_URL = $vars['url']."pg/videolist/watch/".$video_guid;
+	$watch_URL = $vars['url']."videolist/watch/".$video_guid;
 	
 	$object_acl = get_readable_access_level($video_file->access_id);
 	// metadata block, - access level, edit, delete, + options view extender
@@ -40,17 +38,17 @@ if(!empty($video_file)) {
 	
 	if(get_input('show_viewtype') == "all") {
 		$info .= '<p class="entity_title"><a href="' .$watch_URL. '">'.$title.'</a></p>';
-		$info .= "<p class='entity_subtext'><a href=\"{$vars['url']}pg/videolist/owned/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
+		$info .= "<p class='entity_subtext'><a href=\"{$vars['url']}videolist/owned/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
 		$info .= "</p>";
 		$icon = "<a class='video_icon' href=\"{$watch_URL}\">" . elgg_view("videolist/icon", array("mimetype" => $mime, 'thumbnail' => $thumbnail, 'video_guid' => $video_guid, 'size' => 'small')) . "</a>";
 		echo "<div class='video_entity'>".elgg_view_listing($icon, $info)."</div>";
 	} else {
 		$info .= '<p class="entity_title"><a href="' .$watch_URL. '">'.$title.'</a></p>';
-		$info .= "<p class='entity_subtext'><a href=\"{$vars['url']}pg/videolist/owned/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
+		$info .= "<p class='entity_subtext'><a href=\"{$vars['url']}videolist/owned/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
 		$info .= "</p>";
 		$icon = "<a class='video_icon' href=\"{$watch_URL}\">" . elgg_view("videolist/icon", array("mimetype" => $mime, 'thumbnail' => $thumbnail, 'video_guid' => $video_guid, 'size' => 'small')) . "</a>";
 		echo "<div class='video_entity'>".elgg_view_listing($icon, $info)."</div>";
 	}
 } else {
 	echo "<p class='margin_top'>".elgg_echo('videolist:none:found')."</p>";
-}
\ No newline at end of file
+}
diff --git a/views/default/staticvideo/index.php b/views/default/staticvideo/index.php
index e5f6d8fad..8d265fd50 100644
--- a/views/default/staticvideo/index.php
+++ b/views/default/staticvideo/index.php
@@ -27,7 +27,7 @@ if(!empty($owner_videos)) {
 		$video_guid = $node->guid;
 		$video_id = $node->video_id;
 		$videodiv .= "<div id='videobox'>";
-		$videodiv .= "<a href='".$vars['url']."pg/videolist/watch/".$video_guid."'>";
+		$videodiv .= "<a href='".$vars['url']."videolist/watch/".$video_guid."'>";
 		$videodiv .= "<img src='http://img.youtube.com/vi/".$video_id."/default.jpg' width='150' alt='no video'/>";
 		$videodiv .= "</a>";
 
diff --git a/views/default/videolist/group_video_header.php b/views/default/videolist/group_video_header.php
index dd12d1d96..e6d13bca3 100644
--- a/views/default/videolist/group_video_header.php
+++ b/views/default/videolist/group_video_header.php
@@ -5,7 +5,7 @@
  
 $user = page_owner_entity();
 $user_name = elgg_view_title($user->name . "'s " . elgg_echo('videos'));
-$url = $CONFIG->wwwroot . "pg/videolist/browse/". $user->username . "/";
+$url = elgg_get_site_url() . "videolist/browse/". $user->username . "/";
 //if the user is a memebr of the group, show find button
 if($user->isMember(get_loggedin_user()))
 	$upload_link = "<a href=\"{$url}\" class='action_button'>" . elgg_echo('videolist:browsemenu') . '</a>';
@@ -19,4 +19,4 @@ else
 	<div class="content_header_options">
 		<?php echo $upload_link; ?>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/default/videolist/groupprofile_videolist.php b/views/default/videolist/groupprofile_videolist.php
index badfa13a6..33a22ab68 100644
--- a/views/default/videolist/groupprofile_videolist.php
+++ b/views/default/videolist/groupprofile_videolist.php
@@ -11,7 +11,7 @@
 
 ?>
 <div class="group_tool_widget video">
-<span class="group_widget_link"><a href="<?php echo $vars['url'] . "pg/videolist/owned/" . page_owner_entity()->username; ?>"><?php echo elgg_echo('link:view:all')?></a></span>
+<span class="group_widget_link"><a href="<?php echo $vars['url'] . "videolist/owned/" . page_owner_entity()->username; ?>"><?php echo elgg_echo('link:view:all')?></a></span>
 <h3><?php echo elgg_echo("videolist:group"); ?></h3>
 
 <?php
@@ -31,17 +31,17 @@ if ($videos) {
 		$owner = get_entity($f->getOwner());
 		$numcomments = elgg_count_comments($f);
 		echo "<div class='entity_listing clearfloat'>";
-		echo "<div class='entity_listing_icon'><a href=\"{$vars['url']}pg/videolist/watch/{$f->guid}\"><img src=\"".$f->thumbnail."\" border=\"0\" width=\"85\" /></a></div>";
+		echo "<div class='entity_listing_icon'><a href=\"{$vars['url']}videolist/watch/{$f->guid}\"><img src=\"".$f->thumbnail."\" border=\"0\" width=\"85\" /></a></div>";
 		echo "<div class='entity_listing_info'>";
-		echo "<p class='entity_title'><a href=\"{$vars['url']}pg/videolist/watch/{$f->guid}\">" . $f->title ."</a></p><p class='entity_subtext'><a href=\"{$vars['url']}pg/profile/{$owner->username}\">{$owner->name}</a> ";
+		echo "<p class='entity_title'><a href=\"{$vars['url']}videolist/watch/{$f->guid}\">" . $f->title ."</a></p><p class='entity_subtext'><a href=\"{$vars['url']}profile/{$owner->username}\">{$owner->name}</a> ";
 		echo friendly_time($f->time_created) . "</p>";
 		echo "</div></div>";
 
 	}
 
 } else {
-	$upload_video = $vars['url'] . "pg/videolist/browse/" . page_owner_entity()->username;
+	$upload_video = $vars['url'] . "videolist/browse/" . page_owner_entity()->username;
 	echo "<p class='margin_top'><a href=\"{$upload_video}\">" . elgg_echo("videolist:add") . "</a></p>";
 }
 echo "</div>";
-?>
\ No newline at end of file
+?>
diff --git a/views/default/videolist/icon.php b/views/default/videolist/icon.php
index 46c186db1..36b30e5ca 100644
--- a/views/default/videolist/icon.php
+++ b/views/default/videolist/icon.php
@@ -9,10 +9,8 @@
  * @link http://elgg.com/
  */
 
-global $CONFIG;
-
 if($vars['videolist']){
-	echo "<img src=\"{$CONFIG->wwwroot}mod/videolist/graphics/icons/Video_Icon.jpg\" border=\"0\" />";
+	echo "<img src=\"".elgg_get_site_url()."mod/videolist/graphics/icons/Video_Icon.jpg\" border=\"0\" />";
 } else {
 	$mime = $vars['mimetype'];
 	if (isset($vars['thumbnail'])) {
@@ -32,7 +30,7 @@ if($vars['videolist']){
 		if ($size == 'large') {
 			echo "<img src=\"{$thumbnail}\" border=\"0\" />";
 		} else {
-			echo "<img src=\"{$CONFIG->wwwroot}mod/videolist/graphics/icons/Video_Icon.jpg\" border=\"0\" />";
+			echo "<img src=\"".elgg_get_site_url()."mod/videolist/graphics/icons/Video_Icon.jpg\" border=\"0\" />";
 		}
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3