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.

---
 actions/add.php        | 4 ++--
 actions/edit.php       | 6 ++----
 actions/tubesearch.php | 9 ++++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'actions')

diff --git a/actions/add.php b/actions/add.php
index 87f459a3a..4fd6481ae 100644
--- a/actions/add.php
+++ b/actions/add.php
@@ -189,7 +189,7 @@ else if($pageContainer == "vimeo"){
 // Before we can set metadata, we need to save the video
 if (!$videolist->save()) {
 	register_error(elgg_echo("videolist:error"));
-	forward("pg/videolist/new");
+	forward("videolist/new");
 }
 //add video tags
 $videolist_tags_array = string_to_tag_array($_SESSION['videolisttags']);
@@ -208,7 +208,7 @@ unset($_SESSION['candidate_profile_video_access_id']); unset($_SESSION['candidat
 unset($_SESSION['videolisttags']);unset($_SESSION['Pagecontainer']);
 // Forward to the main videolist page
 
-forward("pg/videolist/owned/".page_owner_entity()->username);
+forward("videolist/owned/".page_owner_entity()->username);
 
 // Remove the videolist cache
 unset($_SESSION['candidate_profile_video_access_id']); unset($_SESSION['candidate_profile_video']);
diff --git a/actions/edit.php b/actions/edit.php
index 46df32e16..3aa536e4c 100644
--- a/actions/edit.php
+++ b/actions/edit.php
@@ -2,8 +2,6 @@
 /**
  * Elgg video edit
  */
-
-global $CONFIG;
 	
 // Get variables
 $title = strip_tags(get_input("title_videourl"));
@@ -14,7 +12,7 @@ $guid = (int) get_input('video_guid');
 
 if (!$video = get_entity($guid)) {
 	register_error(elgg_echo("videolist:noentity"));
-	forward($CONFIG->wwwroot . "pg/videolist/" . $_SESSION['user']->username);
+	forward(elgg_get_site_url() . "videolist/" . $_SESSION['user']->username);
 	exit;
 }
 	
@@ -39,4 +37,4 @@ if ($result)
 else
 	register_error(elgg_echo("videolist:editfailed"));
 	
-forward($_SERVER['HTTP_REFERER']);
\ No newline at end of file
+forward($_SERVER['HTTP_REFERER']);
diff --git a/actions/tubesearch.php b/actions/tubesearch.php
index 82f946ab6..761bbb41e 100644
--- a/actions/tubesearch.php
+++ b/actions/tubesearch.php
@@ -30,7 +30,6 @@ if ($page_owner === false || is_null($page_owner)) {
 	set_page_owner($_SESSION['guid']);
 }
 
-global $CONFIG;
 $queryFeed = get_input('q');
 $start_index = get_input('start_index');
 $results_perpage = 10;
@@ -116,7 +115,7 @@ if (!isset($queryFeed) || empty($queryFeed)) {
 			$body .=  "<b>Description : </b>".substr($media->group->description, 0, 140)." ...</p>";
 			$body .=  '</td>';
 
-			$body .=  "<td class='video_actions'><a class='action_button small' onclick=\"javascript:showV_idFeed('".$showEncodedVideo."', ".$k.")\">".elgg_echo('videolist:play:video')."</a> <a class='action_button small' href=\"".$CONFIG->wwwroot."pg/videolist/new/".$container."/title_videourl/".$vid_array[1]."/page/".$queryCatgory."\">".elgg_echo('videolist:add:video')."</a></td>";
+			$body .=  "<td class='video_actions'><a class='action_button small' onclick=\"javascript:showV_idFeed('".$showEncodedVideo."', ".$k.")\">".elgg_echo('videolist:play:video')."</a> <a class='action_button small' href=\"".elgg_get_site_url()."videolist/new/".$container."/title_videourl/".$vid_array[1]."/page/".$queryCatgory."\">".elgg_echo('videolist:add:video')."</a></td>";
 
 			$body .=  '</tr>';
 			$body .=  '</table></div>';
@@ -208,7 +207,7 @@ if (!isset($queryFeed) || empty($queryFeed)) {
 			$body .=  "<p class='entity_subtext'><b>Description : </b>".$desc_src."</p>";
 			$body .=  '</td>';
 
-			$body .=  "<td class='video_actions'><a class='action_button small' onclick=\"javascript:showV_idFeedMetacafe('".$showEncodedVideo."', ".$k.")\">".elgg_echo('videolist:play:video')."</a> <a class='action_button small' href=\"".$CONFIG->wwwroot."pg/videolist/new/".$container."/title_videourl/".$metacafevideoIdArray[0]."/page/".$queryCatgory."\">".elgg_echo('videolist:add:video')."</a></td>";
+			$body .=  "<td class='video_actions'><a class='action_button small' onclick=\"javascript:showV_idFeedMetacafe('".$showEncodedVideo."', ".$k.")\">".elgg_echo('videolist:play:video')."</a> <a class='action_button small' href=\"".elgg_get_site_url()."videolist/new/".$container."/title_videourl/".$metacafevideoIdArray[0]."/page/".$queryCatgory."\">".elgg_echo('videolist:add:video')."</a></td>";
 
 			$body .=  '</tr>';
 			$body .=  '</table>';
@@ -301,7 +300,7 @@ if (!isset($queryFeed) || empty($queryFeed)) {
 				$body .=  "<b>Tags : </b>".implode(', ', $aTags)."</p>";
 				$body .=  '</td>';
 
-				$body .=  "<td class='video_actions'><a class='action_button small' onclick=\"javascript:showV_idFeedVimeo('".$embedidArray[0]."', ".$k.")\">".elgg_echo('videolist:play:video')."</a> <a class='action_button small' href=\"".$CONFIG->wwwroot."pg/videolist/new/".$container."/title_videourl/".$embedidArray[0]."/page/".$queryCatgory."\">".elgg_echo('videolist:add:video')."</a></td>";
+				$body .=  "<td class='video_actions'><a class='action_button small' onclick=\"javascript:showV_idFeedVimeo('".$embedidArray[0]."', ".$k.")\">".elgg_echo('videolist:play:video')."</a> <a class='action_button small' href=\"".elgg_get_site_url()."videolist/new/".$container."/title_videourl/".$embedidArray[0]."/page/".$queryCatgory."\">".elgg_echo('videolist:add:video')."</a></td>";
 
 				$body .=  '</tr>';
 				$body .=  '</table>';
@@ -314,4 +313,4 @@ if (!isset($queryFeed) || empty($queryFeed)) {
 	}
 }
 
-exit;
\ No newline at end of file
+exit;
-- 
cgit v1.2.3