phpgw --> egw and removed some obsolete files

filemanager/inc/class.bofilemanager.inc.php

@@ -34,10 +34,10 @@
 
 		function bofilemanager()
 		{
-			$this->so = CreateObject('filemanager.sofilemanager');
+			$this->so =& CreateObject('filemanager.sofilemanager');
 			$this->so->db_init();
 
-			$this->vfs = CreateObject('phpgwapi.vfs');
+			$this->vfs =& CreateObject('phpgwapi.vfs');
 
 			error_reporting(4);
 

filemanager/inc/class.uifilemanager.inc.php

@@ -83,25 +83,25 @@
 		function uifilemanager()
 		{
 			//			error_reporting(8);
-			$GLOBALS['egw']->browser = CreateObject('phpgwapi.browser');
+			$GLOBALS['egw']->browser =& CreateObject('phpgwapi.browser');
 
 			$this->now = date('Y-m-d');
 
-			$this->bo = CreateObject('filemanager.bofilemanager');
+			$this->bo =& CreateObject('filemanager.bofilemanager');
 
 			$this->t = $GLOBALS['egw']->template;
 
 			// here local vars are created from the HTTP vars
-			@reset($GLOBALS['HTTP_POST_VARS']);
+			@reset($_POST);
-			while(list($name,) = @each($GLOBALS['HTTP_POST_VARS']))
+			while(list($name,) = @each($_POST))
 			{
-				$this->$name = $GLOBALS['HTTP_POST_VARS'][$name];
+				$this->$name = $_POST[$name];
 			}
 
-			@reset($GLOBALS['HTTP_GET_VARS']);
+			@reset($_GET);
-			while(list($name,) = @each($GLOBALS['HTTP_GET_VARS']))
+			while(list($name,) = @each($_GET))
 			{
-				$$name = $GLOBALS['HTTP_GET_VARS'][$name];
+				$$name = $_GET[$name];
 			}
 
 			$to_decode = array
@@ -156,7 +156,7 @@
 			}
 
 			// get appl. and user prefs
-			$pref = CreateObject('phpgwapi.preferences', $this->bo->userinfo['username']);
+			$pref =& CreateObject('phpgwapi.preferences', $this->bo->userinfo['username']);
 			$pref->read_repository();
 			//			$GLOBALS['egw']->hooks->single('add_def_pref', $GLOBALS['appname']);
 			$pref->save_repository(True);
@@ -262,7 +262,7 @@
 					'enable_browser_class'	=> True
 				);
 
-				$GLOBALS['egw']->common->phpgw_header();
+				$GLOBALS['egw']->common->egw_header();
 			}
 
 			# Page to process users
@@ -346,7 +346,7 @@
 			{
 				$group_id = $GLOBALS['egw']->accounts->name2id($group_array['account_name']);
 
-				$applications = CreateObject('phpgwapi.applications', $group_id);
+				$applications =& CreateObject('phpgwapi.applications', $group_id);
 				$this->groups_applications[$group_array['account_name']] = $applications->read_account_specific();
 			}
 
@@ -367,8 +367,8 @@
 				$this->messages[]= $GLOBALS['egw']->common->error_list(array(lang('You do not have access to %1', $this->path)));
 				$this->html_link('/index.php','menuaction=filemanager.uifilemanager.index','path='.$this->homedir, lang('Go to your home directory'));
 
-				$GLOBALS['egw']->common->phpgw_footer();
+				$GLOBALS['egw']->common->egw_footer();
-				$GLOBALS['egw']->common->phpgw_exit();
+				$GLOBALS['egw']->common->egw_exit();
 			}
 
 			$this->bo->userinfo['working_id'] = $this->bo->vfs->working_id;
@@ -412,8 +412,8 @@
 					$this->messages[] = $GLOBALS['egw']->common->error_list(array(lang('Directory %1 does not exist', $this->path)));
 					$this->html_link('/index.php','menuaction=filemanager.uifilemanager.index','path='.$this->bo->homedir, lang('Go to your home directory'));
 
-					$GLOBALS['egw']->common->phpgw_footer();
+					$GLOBALS['egw']->common->egw_footer();
-					$GLOBALS['egw']->common->phpgw_exit();
+					$GLOBALS['egw']->common->egw_exit();
 				}
 			}
 
@@ -861,8 +861,8 @@
 			$this->t->set_var($vars);
 			$this->t->pparse('out','filemanager_footer');
 
-			$GLOBALS['egw']->common->phpgw_footer();
+			$GLOBALS['egw']->common->egw_footer();
-			$GLOBALS['egw']->common->phpgw_exit();
+			$GLOBALS['egw']->common->egw_exit();
 		}
 
 		function readFilesInfo()
@@ -1672,8 +1672,8 @@
 					}
 
 					$this->html_table_end();
-					$GLOBALS['egw']->common->phpgw_footer();
+					$GLOBALS['egw']->common->egw_footer();
-					$GLOBALS['egw']->common->phpgw_exit();
+					$GLOBALS['egw']->common->egw_exit();
 				}
 				else
 				{
@@ -1723,7 +1723,7 @@
 					'string'	=> $this->path.'/'.$this->file,//FIXME
 					'relatives'	=> array(RELATIVE_NONE)
 				));
-				$GLOBALS['egw']->common->phpgw_exit();
+				$GLOBALS['egw']->common->egw_exit();
 			}
 		}
 
@@ -1736,10 +1736,10 @@
 					continue;
 				}
 
-				$download_browser = CreateObject('phpgwapi.browser');
+				$download_browser =& CreateObject('phpgwapi.browser');
 				$download_browser->content_header($this->fileman[$i]);
 				echo $this->bo->vfs->read(array('string' => $this->fileman[$i]));
-				$GLOBALS['egw']->common->phpgw_exit();
+				$GLOBALS['egw']->common->egw_exit();
 			}
 		}
 
@@ -1949,7 +1949,7 @@
 					$href = SEP . $href;
 				}
 
-				/* $phpgw->link requires that the extra vars be passed separately */
+				/* $GLOBALS['egw']->link requires that the extra vars be passed separately */
 				//				$link_parts = explode("?", $href);
 				$address = $GLOBALS['egw']->link($href, $all_args);
 				//				$address = $GLOBALS['egw']->link($href);

filemanager/inc/hook_add_def_pref.inc.php

@@ -1,34 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare - Filemanager                                                 *
-  * http://www.egroupware.org                                                *
-  * ------------------------------------------------------------------------ *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-  /* $Id$ */
-
-	global $pref;
-
-	$pref->change('filemanager', 'name', 'True');
-	$pref->change('filemanager', 'mime_type', 'True');
-	$pref->change('filemanager', 'size', 'True');
-	$pref->change('filemanager', 'created', 'True');
-	$pref->change('filemanager', 'modified', 'True');
-	//$pref->change('filemanager', 'owner', 'False');
-	$pref->change('filemanager', 'createdby_id', 'True');
-	$pref->change('filemanager', 'modifiedby_id', 'True');
-	//$pref->change('filemanager', 'app', 'False');
-	$pref->change('filemanager', 'comment', 'True');
-	//$pref->change('filemanager', 'viewinnewwin', 'False');
-	//$pref->change('filemanager', 'viewonserver', 'False');
-	$pref->change('filemanager', 'viewtextplain', True);
-	//$pref->change('filemanager', 'dotdot', 'False');
-	//$pref->change('filemanager', 'dotfiles', 'False');
-	//$pref->change('filemanager', 'show_help', 'False');
-	$pref->change('filemanager', 'show_upload_boxes', '5');
-
-?>

filemanager/inc/hook_admin.inc.php

@@ -1,3 +0,0 @@
-<?php
-
-?>

filemanager/inc/hook_deleteaccount.inc.php

@@ -10,7 +10,7 @@
 	\**************************************************************************/
 	/* $Id$ */
 	/*
-	global $phpgw;
+	
 	global $account_id;
 	*/
 	/* NOTE: This is untested */
@@ -18,11 +18,11 @@
 	/* Should also be capable of transfering files to another user */
 
 /*
-	$phpgw->vfs->working_id = $account_id;
+	$GLOBALS['egw']->vfs->working_id = $account_id;
-	$ls_array = $phpgw->vfs->ls ($phpgw->vfs->fakebase . "/" . $account_id, array (RELATIVE_NONE));
+	$ls_array = $GLOBALS['egw']->vfs->ls ($GLOBALS['egw']->vfs->fakebase . "/" . $account_id, array (RELATIVE_NONE));
 	while (list ($num, $entry) = each ($ls_array))
 	{
-		$phpgw->vfs->rm ($entry["dir"] . "/" . $entry["name"], array (RELATIVE_NONE));
+		$GLOBALS['egw']->vfs->rm ($entry["dir"] . "/" . $entry["name"], array (RELATIVE_NONE));
 	}
 */
 ?>

filemanager/inc/hook_sidebox_menu.inc.php

@@ -23,7 +23,7 @@
 	display_sidebox can be called as much as you like
  */
 
-	$menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
+	$menu_title = $GLOBALS['egw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
 	$file = Array(
 		array(
 			'',

filemanager/index.php

@@ -11,13 +11,15 @@
 	
 	/* $Id$ */
 
-	$GLOBALS['egw_info']['flags'] = array(
+	$GLOBALS['egw_info'] = array(
+		'flags' => array(
 			'currentapp'    => 'filemanager',
 			'noheader'      => True,
 			'nonavbar'      => True,
 			'noappheader'   => True,
 			'noappfooter'   => True,
-		'nofooter'      => True
+			'nofooter'      => True,
+		),
 	);
 	include('../header.inc.php');
 

filemanager/preferences.php

@@ -1,156 +0,0 @@
-<?php
-  /**************************************************************************\
-  * eGroupWare                                                               *
-  * http://www.egroupware.org                                                *
-  * --------------------------------------------                             *
-  *  This program is free software; you can redistribute it and/or modify it *
-  *  under the terms of the GNU General Public License as published by the   *
-  *  Free Software Foundation; either version 2 of the License, or (at your  *
-  *  option) any later version.                                              *
-  \**************************************************************************/
-
-	/* $Id$ */
-
-	$GLOBALS['phpgw_info']['flags'] = array(
-		'currentapp' => 'filemanager',
-		'enable_nextmatchs_class' => True,
-		'noheader' => True,
-		'nonavbar' => True
-	);
-
-	//var_dump($file_attributes);
-	include('../header.inc.php');
-	/*
-	   To add an on/off preference, just add it here.  Key is internal name, value is displayed name
-	*/
-	$other_checkboxes = array ("viewinnewwin" => lang("View documents in new window"), "viewonserver" => lang("View documents on server (if available)"), "viewtextplain" => lang("Unknown MIME-type defaults to text/plain when viewing"), "dotdot" => lang("Show .."), "dotfiles" => lang("Show .files"), "show_help" => lang("Show help"), "show_command_line" => lang("Show command line (EXPERIMENTAL. DANGEROUS.)"));
-
-	/*
-	   To add a dropdown preferences, add it here.  Key is internal name, value key is
-	   displayed name, value values are choices in the dropdown
-	*/
-	$other_dropdown = array ("show_upload_boxes" => array (lang("Default number of upload fields to show"), "5", "10", "20", "30"));
-
-	if ($submit)
-	{
-		$GLOBALS['phpgw']->preferences->read_repository ();
-
-		reset ($other_checkboxes);
-		while (list ($internal, $displayed) = each ($other_checkboxes))
-		{
-			$GLOBALS['phpgw']->preferences->add ($GLOBALS['phpgw_info']["flags"]["currentapp"], $internal, $$internal);
-		}
-
-		reset ($other_dropdown);
-		while (list ($internal, $displayed) = each ($other_dropdown))
-		{
-			$GLOBALS['phpgw']->preferences->add ($GLOBALS['phpgw_info']["flags"]["currentapp"], $internal, $$internal);
-		}
-
-		reset ($file_attributes);
-		while (list ($internal, $displayed) = each ($file_attributes))
-		{
-			$GLOBALS['phpgw']->preferences->add ($GLOBALS['phpgw_info']["flags"]["currentapp"], $internal, $$internal);
-		}
-
-
-		$GLOBALS['phpgw']->preferences->save_repository (True);
-     
-		Header('Location: '.$GLOBALS['phpgw']->link('/preferences/index.php'));
-		$GLOBALS['phpgw']->common->phpgw_exit();
-	}
-
-	function display_item ($field,$data)
-	{
-		global $p, $tr_color;
-
-		$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color ($tr_color);
-		$var = array (
-			'bg_color'	=>	$tr_color,
-			'field'		=>	$field,
-			'data'		=>	$data
-		);
-		$p->set_var ($var);
-		$p->parse ('row', 'pref_list', True);
-	}
-
-	$GLOBALS['phpgw']->common->phpgw_header ();
-	echo parse_navbar ();
-
-	$p = CreateObject ('phpgwapi.Template', $GLOBALS['phpgw']->common->get_tpl_dir ('filemanager'));
-	$templates = array (
-		'pref'			=> 'pref.tpl',
-		'pref_colspan'	=> 'pref_colspan.tpl',
-		'pref_list'		=>	'pref_list.tpl'
-	);
-	$p->set_file ($templates);
-
-	$var = array (
-		'title'			=>	lang ('FileManager preferences'),
-		'action_url'	=>	$GLOBALS['phpgw']->link ('/' . $GLOBALS['phpgw_info']['flags']['currentapp'] . '/preferences.php'),
-		'bg_color'		=>	$GLOBALS['phpgw_info']['theme']['th_bg'],
-		'submit_lang'	=>	lang ('submit')
-	);
-	
-	$p->set_var ($var);
-	$p->set_var ('text', '&nbsp;');
-	$p->parse ('row', 'pref_colspan', True);
-
-	if ($totalerrors)
-	{
-		echo '<p><center>' . $GLOBALS['phpgw']->common->error_list($errors) . '</center>';
-	}
-
-
-	while (list ($internal, $displayed) = each ($file_attributes))
-	{
-		unset ($checked);
-		if ($GLOBALS['phpgw_info']["user"]["preferences"]["filemanager"][$internal])
-		{
-			$checked = 1;
-		}
-
-		$str .= html_form_input ("checkbox", $internal, NULL, NULL, NULL, $checked, NULL, 1) . " $displayed" . html_break (1, NULL, 1);
-	}
-
-	display_item (lang ('Display attributes'), $str);
-
-	reset ($other_checkboxes);
-	while (list ($internal, $displayed) = each ($other_checkboxes))
-	{
-		unset ($checked);
-		if ($GLOBALS['phpgw_info']["user"]["preferences"]["filemanager"][$internal])
-		{
-			$checked = 1;
-		}
-
-		$str = html_form_input ("checkbox", $internal, NULL, NULL, NULL, $checked, NULL, 1);
-		display_item ($displayed, $str);
-	}
-
-	reset ($other_dropdown);
-	while (list ($internal, $value_array) = each ($other_dropdown))
-	{
-		reset ($value_array);
-		unset ($options);
-		while (list ($num, $value) = each ($value_array))
-		{
-			if ($num == 0)
-			{
-				$displayed = $value;
-				continue;
-			}
-
-			$options .= html_form_option ($value, $value, $GLOBALS['phpgw_info']["user"]["preferences"]["filemanager"][$internal] == $value, True);
-		}
-
-		$output = html_form_select_begin ($internal, True);
-		$output .= $options;
-		$output .= html_form_select_end (True);
-
-		display_item ($displayed, $output);
-	}
-
-	$p->pparse ('out', 'pref');
-	$GLOBALS['phpgw']->common->phpgw_footer ();
-?>

filemanager/setup/setup.inc.php

@@ -19,12 +19,9 @@
 
 	/* The hooks this app includes, needed for hooks registration */
 	$setup_info['filemanager']['hooks'] = array(
-		'add_def_pref',
-		'admin',
 		'deleteaccount',
 		'settings',
 		'sidebox_menu',
-		'personalizer',
 		'preferences'
 	);