Index: unk/info.php
===================================================================
--- /trunk/info.php	(revision 7414)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?php
-$BALANCEID = '';
-if(isset($_COOKIE['BALANCEID'])) {
-    $BALANCEID = $_COOKIE['BALANCEID'];
-}
-echo "BALANCEID:$BALANCEID\n";
-
-$sessionid = '';
-if(isset($_COOKIE['sessionid'])) {
-    $sessionid = $_COOKIE['sessionid'];
-}
-echo "sessionid:$sessionid\n";
-
-$session_save_path = ini_get('session.save_path');
-$session_save_path = trim($session_save_path);
-$last_char = $session_save_path[strlen($session_save_path)-1];
-if(($last_char != '/') && ($last_char != '\\')) {
-    $session_save_path .= '/';
-}
-$session_file = $session_save_path . 'sess_' . $_COOKIE['sessionid'];
-echo "session_file:$session_file\n";
-
-$user_id = '';
-if(is_file($session_file)) {
-
-    $session_contents = file_get_contents($session_file);
-    $session_contents_array = explode('|', $session_contents);
-
-    for($k = 0; $k < count($session_contents_array); $k++) {
-        $ss = unserialize($session_contents_array[$k]);
-        if(($ss['session_lid']) && ($ss['session_id']) && ($ss['session_id'] == $_COOKIE['sessionid'])) {
-            $user_id = $ss['session_lid'];
-            break;
-        }
-    }
-}
-echo "user_id:$user_id\n";
-?>
Index: unk/.project
===================================================================
--- /trunk/.project	(revision 2)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>expresso</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>net.sourceforge.phpeclipse.parserbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>net.sourceforge.phpeclipse.phpnature</nature>
-	</natures>
-</projectDescription>
Index: unk/set_box.php
===================================================================
--- /trunk/set_box.php	(revision 2)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?php
-  /**************************************************************************\
-  * phpGroupWare                                                             *
-  * http://www.phpgroupware.org                                              *
-  * The file written by Joseph Engo <jengo@phpgroupware.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.                                              *
-  \**************************************************************************/
-
-
-	$GLOBALS['phpgw_info']['flags'] = Array(
-		'noheader'	=> True,
-		'nofooter'	=> True,
-		'currentapp'	=> 'home'
-	);
-	include('header.inc.php');
-
-//	if(basename($HTTP_REFERER) != 'home.php')
-//	{
-//		Header('Location: '.$GLOBALS['phpgw']->link('/home.php'));
-//		$GLOBALS['phpgw']->common->phpgw_exit();
-//	}
-
-	@reset($GLOBALS['phpgw_info']['user']['preferences']);
-	//_debug_array($GLOBALS['phpgw_info']['user']['preferences']['portal_order']);
-//	$GLOBALS['phpgw']->preferences->delete('portal_order');
-//	unset($GLOBALS['phpgw_info']['user']['preferences']['portal_order']);
-//	$GLOBALS['phpgw']->preferences->save_repository();
-
-	function move_boxes($curr_position,$new_order,$offset,$value_to_check,$max_num)
-	{
-		//echo "MOVE: $curr_position,$new_order,$offset,$value_to_check,$max_num<br>";
-		if(isset($GLOBALS['phpgw_info']['user']['preferences']['portal_order'][$new_order]))
-		{
-			if($new_order == $max_num)
-			{
-				if($offset < 0)
-				{
-					@ksort($GLOBALS['phpgw_info']['user']['preferences']['portal_order']);
-				}
-				else
-				{
-					@krsort($GLOBALS['phpgw_info']['user']['preferences']['portal_order']);
-				}
-				while(list($seq_order,$appid) = each($GLOBALS['phpgw_info']['user']['preferences']['portal_order']))
-				{
-					if($seq_order != $value_to_check)
-					{
-						$prev_seq = $seq_order + $offset;
-						$GLOBALS['phpgw']->preferences->delete('portal_order',$prev_seq);
-						$GLOBALS['phpgw']->preferences->add('portal_order',$prev_seq,$appid);
-					}
-				}
-			}
-			else
-			{
-				$GLOBALS['phpgw']->preferences->delete('portal_order',$curr_position);
-				$GLOBALS['phpgw']->preferences->add('portal_order',$curr_position,(int)$GLOBALS['phpgw_info']['user']['preferences']['portal_order'][$new_order]);
-			}
-		}
-		$GLOBALS['phpgw']->preferences->delete('portal_order',$new_order);
-		$GLOBALS['phpgw']->preferences->add('portal_order',$new_order,(int)$_GET['app']);
-			
-		$GLOBALS['phpgw']->preferences->save_repository();
-	}
-
-	//error_reporting(E_ALL);
-	switch($_GET['control'])
-	{
-		//print_debug('set_box', $GLOBALS['phpgw_info']['user']['preferences']['portal_order']),'app',5);
-		case 'up':
-			$curr_position = $GLOBALS['phpgw']->common->find_portal_order((int)$_GET['app']);
-			$max_count = count($GLOBALS['phpgw_info']['user']['preferences']['portal_order']) - 1;
-			$offset = -1;
-			if($curr_position <= 0)
-			{
-				$new_order = $max_count;
-			}
-			else
-			{
-				$new_order = $curr_position + $offset;
-			}
-			move_boxes($curr_position,$new_order,$offset,0,$max_count);
-			break;
-		case 'down':
-			$curr_position = $GLOBALS['phpgw']->common->find_portal_order((int)$_GET['app']);
-			$max_count = count($GLOBALS['phpgw_info']['user']['preferences']['portal_order']) - 1;
-			$offset = 1;
-			if($curr_position >= $max_count)
-			{
-				$new_order = 0;
-			}
-			else
-			{
-				$new_order = $curr_position + $offset;
-			}
-			move_boxes($curr_position,$new_order,$offset,$max_count,0);
-			break;
-		case 'edit':
-		case 'question':
-		case 'close':
-		default:
-	}
-
-	header('Location: '.$GLOBALS['phpgw']->link('/home.php'));
-	$GLOBALS['phpgw']->common->phpgw_exit();
-?>
-
Index: unk/login.php
===================================================================
--- /trunk/login.php	(revision 8198)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare login                                                         *
-	* http://www.egroupware.org                                                *
-	* Originaly written by Dan Kuykendall <seek3r@phpgroupware.org>            *
-	*                      Joseph Engo    <jengo@phpgroupware.org>             *
-	* Updated by Nilton Emilio Buhrer Neto <niltonneto@celepar.pr.gov.br>      *
-	*  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.                                              *
-	\**************************************************************************/
-	
-	$phpgw_info = array();
-	$submit = False;			// set to some initial value
-
-	$GLOBALS['phpgw_info']['flags'] = array(
-		'disable_Template_class' => True,
-		'login'                  => True,
-		'currentapp'             => 'login',
-		'noheader'               => True
-	);
-
-	if(file_exists('./header.inc.php'))
-	{
-		include('./header.inc.php');
-		// Force location to home, while logged in.
-		$GLOBALS['sessionid'] = @$_GET['sessionid'] ? $_GET['sessionid'] : @$_COOKIE['sessionid'];
-		
-		if(isset($GLOBALS['sessionid']) && $_GET['cd'] != 10)
-		{
-			if( $_GET['cd'] != '66' )
-			{
-				$GLOBALS['phpgw']->redirect_link('/home.php');
-			}
-
-		}
-		
-		if ($GLOBALS['phpgw_info']['server']['use_https'] > 0)
-		{
-			if ($_SERVER['HTTPS'] != 'on')
-			{
-        		Header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-				exit;
-			}
-		}
-			
-		$GLOBALS['phpgw']->session = CreateObject('phpgwapi.sessions');	
-		
-	}
-	else
-	{
-		Header('Location: setup/index.php');
-		exit;
-	}
-		
-	if($_POST)
-	{
-	    $accountInfo = $GLOBALS['phpgw']->accounts->read_repository();
-	    isset($_COOKIE[ 'sessionid' ]) ? session_id($_COOKIE[ 'sessionid' ]) : session_id(); 
-	    session_start();
-	    //Carregando na sessão configurações do usuario usado na nova API.	
-	    $_SESSION['wallet']['user']['uid']	          =  $accountInfo['account_lid'];
-	    $_SESSION['wallet']['user']['uidNumber']      =  $accountInfo['account_id'];
-	    $_SESSION['wallet']['user']['password']       =  $_POST['passwd'];
-	    $_SESSION['wallet']['user']['cn']             =  $accountInfo['firstname'].' '.$accountInfo['lastname'];
-	    $_SESSION['wallet']['user']['mail']           =  $accountInfo['email'];
-
-	    $_SESSION['wallet']['Sieve']['user']          =  $accountInfo['account_lid'];
-	    $_SESSION['wallet']['Sieve']['password']      =  $_POST['passwd'];
-
-	    $_SESSION['wallet']['Cyrus']['user']          =  $accountInfo['account_lid'];
-	    $_SESSION['wallet']['Cyrus']['password']      =  $_POST['passwd'];
-
-	}
-	
-	//detect if the user has a compatible browser, if don't have send him to expresso mini
-	$ifMobile = false;
-	$browser = CreateObject('phpgwapi.browser');
-	switch ( $browser->get_platform() )
-	{
-		case browser::PLATFORM_IPHONE:
-		case browser::PLATFORM_IPOD:
-		case browser::PLATFORM_IPAD:
-		case browser::PLATFORM_BLACKBERRY:
-		case browser::PLATFORM_NOKIA:
-		case browser::PLATFORM_ANDROID:
-		case browser::PLATFORM_WINMOBILE:
-			$ifMobile = true;						
-			break;
-	}
-
-	if( $ifMobile && $_GET['dont_redirect_if_moble'] != 1 ) 
-	{
-		$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = preg_replace("/\,.*/","",$GLOBALS['_SERVER']['HTTP_ACCEPT_LANGUAGE']);
-		$GLOBALS['phpgw']->redirect_link('/mobile/login.php');
-	}
-	else
-	{
-		$GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['login_template_set'];
-		$tmpl = CreateObject('phpgwapi.Template', $GLOBALS['phpgw_info']['server']['template_dir']);
-	
-		// read the images from the login-template-set, not the (maybe not even set) users template-set
-		$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] = $GLOBALS['phpgw_info']['login_template_set'];
-	
-		// This is used for system downtime, to prevent new logins.
-		if($GLOBALS['phpgw_info']['server']['deny_all_logins'])
-		{
-			$deny_msg=lang('Oops! You caught us in the middle of system maintainance.<br/>
-			Please, check back with us shortly.');
-	
-			$tmpl->set_file(array('login_form' => 'login_denylogin.tpl'));
-	
-			$tmpl->set_var('template_set','default');
-			$tmpl->set_var('deny_msg',$deny_msg);
-			$tmpl->pfp('loginout','login_form');
-			exit;
-		}
-		$tmpl->set_file(array('login_form' => 'login.tpl'));
-	
-		$tmpl->set_var('template',$GLOBALS['phpgw_info']['login_template_set']);
-		$tmpl->set_var('lang',$_GET['lang']?$_GET['lang']:preg_replace("/\,.*/","",$GLOBALS['_SERVER']['HTTP_ACCEPT_LANGUAGE']));
-	
-		if (count($GLOBALS['phpgw_info']['server']['login_logo_file']) > 0)
-			$tmpl->set_var('logo_config',$GLOBALS['phpgw_info']['server']['login_logo_file']);
-		else
-			$tmpl->set_var('logo_config','<a title="Governo do Paran&aacute" href="http://www.pr.gov.br" target="_blank"><img src="phpgwapi/templates/'.$GLOBALS['phpgw_info']['login_template_set'].'/images/logo_governo.gif" border="0"></a></td>
-			<td><div align="center"><font color="#9a9a9a" face="Verdana, Arial, Helvetica, sans-serif" size="1">
-	<a title="Celepar Inform&aacute;tica do Paran&aacute;" target="_blank" href="http://www.celepar.pr.gov.br/">
-	<img src="phpgwapi/templates/'.$GLOBALS['phpgw_info']['login_template_set'].'/images/logo_celepar.gif" border="0"></a>');
-		// !! NOTE !!
-		// Do NOT and I repeat, do NOT touch ANYTHING to do with lang in this file.
-		// If there is a problem, tell me and I will fix it. (jengo)
-	
-		// whoooo scaring
-	
-		// ServerID => Identify the Apache Frontend.
-		if($GLOBALS['phpgw_info']['server']['usecookies'] == True && $GLOBALS['phpgw_info']['server']['use_frontend_id'])
-		{
-			$GLOBALS['phpgw']->session->phpgw_setcookie('serverID', $GLOBALS['phpgw_info']['server']['use_frontend_id']);
-		}
-		if($GLOBALS['phpgw_info']['server']['captcha']==1)
-	  	{
-			session_start();
-	  	}
-			  			
-		include(personalize_include_path('phpgwapi','login'));
-	}   
-            
-?>
Index: unk/logout.php
===================================================================
--- /trunk/logout.php	(revision 3018)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare                                                             *
-	* http://www.phpgroupware.org                                              *
-	* Written by Joseph Engo <jengo@phpgroupware.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.                                              *
-	\**************************************************************************/
-
-
-	$phpgw_info = array();
-	$GLOBALS['phpgw_info']['flags'] = array(
-		'disable_Template_class' => True,
-		'currentapp'             => 'logout',
-		'noheader'               => True,
-		'nofooter'               => True,
-		'nonavbar'               => True
-	);
-	include(dirname( __FILE__ ).'/header.inc.php');
-
-	$GLOBALS['sessionid'] = get_var('sessionid',array('GET','COOKIE'));
-	$GLOBALS['kp3']       = get_var('kp3',array('GET','COOKIE'));
-	$account_id = $GLOBALS['phpgw_info']['user']['account_id'];
-	$verified = $GLOBALS['phpgw']->session->verify();
-	if ($verified)
-	{
-		if (file_exists($GLOBALS['phpgw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid']))
-		{
-			$dh = opendir($GLOBALS['phpgw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid']);
-			while ($file = readdir($dh))
-			{
-				if ($file != '.' && $file != '..')
-				{
-					unlink($GLOBALS['phpgw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid'] . SEP . $file);
-				}
-			}
-			rmdir($GLOBALS['phpgw_info']['server']['temp_dir'] . SEP . $GLOBALS['sessionid']);
-		}
-		$GLOBALS['phpgw']->hooks->process('logout');
-		$GLOBALS['phpgw']->session->destroy($GLOBALS['sessionid'],$GLOBALS['kp3']);
-	}
-	else
-	{	
-		if(is_object($GLOBALS['phpgw']->log) && $account_id != '')
-		{
-			$GLOBALS['phpgw']->log->write(array(
-				'text' => 'W-VerifySession, could not verify session during logout',
-				'line' => __LINE__,
-				'file' => __FILE__
-			));
-		}
-	}
-	$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid');
-	$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
-	$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
-	if($GLOBALS['phpgw_info']['server']['sessions_type'] == 'php4')
-	{
-		$GLOBALS['phpgw']->session->phpgw_setcookie(PHPGW_PHPSESSID);
-	}
-
-	$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'].'/login.php?cd=1');
-?>
Index: unk/header.inc.php.template
===================================================================
--- /trunk/header.inc.php.template	(revision 8142)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare                                                               *
-	* http://www.egroupware.org                                                *
-	* This file was originaly written by Dan Kuykendall                        *
-	* --------------------------------------------                             *
-	*  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: header.inc.php.template,v 1.55.2.1 2004/08/03 14:05:35 reinerj Exp $ */
-
-	/**************************************************************************\
-	* !!!!!!! EDIT THESE LINES !!!!!!!!                                        *
-	* This setting allows you to easily move the include directory and the     *
-	* base of the eGroupWare install. Simple edit the following 2 lines with   *
-	* the absolute path to fit your site, and you should be up and running.    *
-	\**************************************************************************/
-	ob_start();
-	define('PHPGW_SERVER_ROOT','{SERVER_ROOT}');
-	define('PHPGW_INCLUDE_ROOT','{INCLUDE_ROOT}');
-	$GLOBALS['phpgw_info']['server']['header_admin_user'] = '{HEADER_ADMIN_USER}';
-	$GLOBALS['phpgw_info']['server']['header_admin_password'] = '{HEADER_ADMIN_PASSWORD}';
-	$GLOBALS['phpgw_info']['server']['setup_acl'] = '{SETUP_ACL}';
-
-	// Opcoes exclusivas a partir da versão 2.0 :: Configurar via setup/header
-	$GLOBALS['phpgw_info']['server']['captcha'] = {CAPTCHA};
-	$GLOBALS['phpgw_info']['server']['num_badlogin'] = {NUM_BADLOGIN};
-    	$GLOBALS['phpgw_info']['server']['atributoexpiracao'] = '{ATRIBUTOEXPIRACAO}';
-    	$GLOBALS['phpgw_info']['server']['atributousuarios'] = '{ATRIBUTOUSUARIOS}';
-	$GLOBALS['phpgw_info']['server']['certificado'] = {CERTIFICADO};
-        $GLOBALS['phpgw_info']['server']['certificado_atributo_cpf'] = '{CERTIFICADO_ATRIBUTO_CPF}';
-	$GLOBALS['phpgw_info']['server']['use_assinar_criptografar'] = {USE_ASSINAR_CRIPTOGRAFAR};
-    	$GLOBALS['phpgw_info']['server']['num_max_certs_to_cipher'] = {NUM_MAX_CERTS_TO_CIPHER};
-
-	// Opcoes exlusivas para o Expresso Livre
-	$GLOBALS['phpgw_info']['server']['use_https'] = {USE_HTTPS};
-	$GLOBALS['phpgw_info']['server']['sugestoes_email_to'] = '{SUGESTOES_EMAIL_TO}';
-	$GLOBALS['phpgw_info']['server']['domain_name'] = '{DOMAIN_NAME}';
-	$GLOBALS['phpgw_info']['server']['use_prefix_organization'] = {USE_PREFIX_ORGANIZATION};    
-	
-	// If you want to identify your App Server (recommended for multiple servers):
-	//$GLOBALS['phpgw_info']['server']['use_frontend_id']   = 1024;
-	//$GLOBALS['phpgw_info']['server']['use_frontend_name'] = '01';
-			
-	/* eGroupWare domain-specific db settings */{domains}
-	/*
-	** If you want to have your domains in a select box, change to True
-	** If not, users will have to login as user@domain
-	** Note: This is only for virtual domain support, default domain users can login only using
-	** there loginid.
-	*/
-	$GLOBALS['phpgw_info']['server']['show_domain_selectbox'] = {DOMAIN_SELECTBOX};
-
-	$GLOBALS['phpgw_info']['server']['db_persistent'] = {DB_PERSISTENT};
-
-	/*
-	** eGroupWare can handle session management using the database or 
-	** the session support built into PHP4 which usually gives better
-	** performance. 
-	** Your choices are 'db' or 'php4'
-	*/
-	$GLOBALS['phpgw_info']['server']['sessions_type'] = '{SESSIONS_TYPE}';
-
-	/* Select which login template set you want, most people will use default */
-	$GLOBALS['phpgw_info']['login_template_set'] = 'default';
-
-	/* This is used to control mcrypt's use */
-	$GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = {ENABLE_MCRYPT};
-	/* Set this to 'old' for versions < 2.4, otherwise the exact mcrypt version you use. */
-	$GLOBALS['phpgw_info']['server']['versions']['mcrypt'] = '{MCRYPT_VERSION}';
-
-	/*
-	** This is a random string used as the initialization vector for mcrypt
-	** feel free to change it when setting up eGrouWare on a clean database,
-	** but you must not change it after that point!
-	** It should be around 30 bytes in length.
-	*/
-	$GLOBALS['phpgw_info']['server']['mcrypt_iv'] = '{MCRYPT_IV}';
-        if(!function_exists('perfgetmicrotime'))
-        {
-	if(!isset($GLOBALS['phpgw_info']['flags']['nocachecontrol']) || !$GLOBALS['phpgw_info']['flags']['nocachecontrol'])
-	{
-		header('Cache-Control: no-cache, must-revalidate');  // HTTP/1.1
-		header('Pragma: no-cache');                          // HTTP/1.0
-	}
-	else
-	{
-		// allow caching by browser
-		session_cache_limiter(PHP_VERSION >= 4.2 ? 'private_no_expire' : 'private');
-	}
-        }
-	/* debugging settings */
-	define('DEBUG_APP',  False);
-	define('DEBUG_API',  False);
-	define('DEBUG_DATATYPES',  False);
-	define('DEBUG_LEVEL',  3);
-	define('DEBUG_OUTPUT', 2); /* 1 = screen,  2 = DB. For both use 3. */
-	define('DEBUG_TIMER', False);
-
-	function perfgetmicrotime()
-	{
-		list($usec, $sec) = explode(' ',microtime());
-		return ((float)$usec + (float)$sec);
-	}
-
-	if (DEBUG_TIMER)
-	{
-		$GLOBALS['debug_timer_start'] = perfgetmicrotime();
-	}
-
-	/**************************************************************************\
-	* Do not edit these lines                                                  *
-	\**************************************************************************/
-	define('PHPGW_API_INC',PHPGW_INCLUDE_ROOT.'/phpgwapi/inc');
-	include(PHPGW_SERVER_ROOT.'/phpgwapi/setup/setup.inc.php');
-	$GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] = $setup_info['phpgwapi']['version'];
-	$GLOBALS['phpgw_info']['server']['versions']['current_header'] = $setup_info['phpgwapi']['versions']['current_header'];
-	unset($setup_info);
-	$GLOBALS['phpgw_info']['server']['versions']['header'] = '2.5.1';
-	/* This is a fix for NT */
-	if(!isset($GLOBALS['phpgw_info']['flags']['noapi']) || !$GLOBALS['phpgw_info']['flags']['noapi'] == True)
-	{
-		include(PHPGW_API_INC . '/functions.inc.php');
-	}
-	$connection_id = $GLOBALS['phpgw']->session->sessionid;
-	if (!strlen($connection_id) != 32){
-		include("header.session.inc.php");
-	}
-
-	/*
-	  Leave off the final php closing tag, some editors will add
-	  a \n or space after which will mess up cookies later on
-	*/
-	<!-- BEGIN domain -->
-	$GLOBALS['phpgw_domain']['{DB_DOMAIN}'] = array(
-		'db_host' => '{DB_HOST}',
-		'db_port' => '{DB_PORT}',
-		'db_name' => '{DB_NAME}',
-		'db_user' => '{DB_USER}',
-		'db_pass' => '{DB_PASS}',
-		// Look at the README file
-		'db_type' => '{DB_TYPE}',
-		// This will limit who is allowed to make configuration modifications
-		'config_user'   => '{CONFIG_USER}',
-		'config_passwd' => '{CONFIG_PASS}'
-	);
-
-<!-- END domain -->
Index: unk/header.session.inc.php
===================================================================
--- /trunk/header.session.inc.php	(revision 7655)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?php
-require_once(__DIR__.'/prototype/api/esecurity.php');
-$s = new ESecurity();
-$s->valid();
-
-
-		/*************************************************************************** 
-		* Expresso Livre                                                           * 
-		* http://www.expressolivre.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.                                              * 
-		\**************************************************************************/ 
-		
-if ( isset( $_COOKIE[ 'sessionid' ] ) ) 
-	session_id( $_COOKIE[ 'sessionid' ] ); 
-
-if( !isset($_SESSION) )
-    session_start( );
-
-$sess = $_SESSION[ 'phpgw_session' ];
-$invalidSession = false; 
-$user_agent = array(); 
-if (isset($GLOBALS['phpgw']) && !isset($_SESSION['connection_db_info'])){ 
-	$_SESSION['phpgw_info']['admin']['server']['sessions_checkip'] = $GLOBALS['phpgw_info']['server']['sessions_checkip'];
-	if($GLOBALS['phpgw_info']['server']['use_https'] == 1){ 
-		$new_ip = (isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? $_SERVER['HTTP_X_FORWARDED_FOR']."," : ""). $_SERVER['REMOTE_ADDR'];		
-		if(strlen($new_ip)>30){
-			$ip_exploded = explode(",",$new_ip);
-			$new_ip = "";
-			for($i=0;$i<2;++$i)
-				$new_ip .= isset($ip_exploded[$i])?(($i==1?",":"").trim($ip_exploded[$i])):("");
-			if(strlen($new_ip)>30)
-				$new_ip = $ip_exploded[0];
-		}		
-		$GLOBALS['phpgw']->db->query("UPDATE phpgw_access_log SET ip='$new_ip' WHERE account_id <> 0 and lo = 0 and sessionid='{$GLOBALS['sessionid']}'",__LINE__,__FILE__);
-	} 
-	 $GLOBALS['phpgw']->db->query("select trim(sessionid),".($_SESSION['phpgw_info']['admin']['server']['sessions_checkip'] ? "ip," : "")."browser from phpgw_access_log where account_id <> 0 and lo = 0 and sessionid='{$GLOBALS['sessionid']}' limit 1",__LINE__,__FILE__); 
-	$GLOBALS['phpgw']->db->next_record(); 
-	if($GLOBALS['phpgw']->db->row( )) 
-		$_SESSION['connection_db_info']['user_auth'] = implode("",$GLOBALS['phpgw']->db->row( )); 
-} 
-if($_SESSION['connection_db_info']['user_auth']){ 
-	$invalidSession = true; 
-	$http_user_agent = substr($_SERVER[ 'HTTP_USER_AGENT' ],0,199); 
-	$user_ip = isset($_SERVER['HTTP_X_FORWARDED_FOR']) ? array($_SERVER['REMOTE_ADDR'], $_SERVER['HTTP_X_FORWARDED_FOR']) : array($_SERVER['REMOTE_ADDR']); 
-	$user_agent[] = ($_SESSION['phpgw_info']['admin']['server']['sessions_checkip'] ? "{$sess['session_id']}{$user_ip[0]}" : "{$sess['session_id']}").$http_user_agent;
-	if(count($user_ip) == 2) { 
-		$user_agent[] = "{$sess['session_id']}{$user_ip[1]}".$http_user_agent; 
-		$user_agent[] = $sess['session_id'].implode(",",array_reverse($user_ip)).$http_user_agent; 
-	} 
-	$pconnection_id = $_SESSION['connection_db_info']['user_auth']; 
-	if(array_search($pconnection_id, $user_agent)  !== FALSE) { 
-		$invalidSession = false; 
-	} 
-} 
-if (empty($_SESSION['phpgw_session']['session_id']) || $invalidSession) 
-{
-	if($_SESSION['connection_db_info']['user_auth'] && !strstr($_SERVER['SCRIPT_NAME'],"/controller.php")) {
-		error_log( '[ INVALID SESSION ] >>>>' .$_SESSION['connection_db_info']['user_auth'].'<<<< - >>>>' . implode("",$user_agent), 0 ); 
-		$GLOBALS['phpgw']->session->phpgw_setcookie('sessionid'); 
-		$GLOBALS['phpgw']->redirect($GLOBALS['phpgw_info']['server']['webserver_url'].'/login.php?cd=10'); 
-	} 
-
-	setcookie(session_name(),"",0); // Removing session cookie. 
-	unset($_SESSION);                               // Removing session values. 
-	// From ExpressoAjax response "nosession" 
-	if(strstr($_SERVER['SCRIPT_NAME'],"/controller.php")){ 
-		echo serialize(array("nosession" => true)); 
-		exit; 
-	} 
-} 
-else{ 
-	// From ExpressoAjax update session_dla (datetime last access).  
-	if(strstr($_SERVER['SCRIPT_NAME'],"/controller.php")) 
-		$_SESSION['phpgw_session']['session_dla'] = time(); 
-
-}
-?>
Index: unk/.htaccess
===================================================================
--- /trunk/.htaccess	(revision 7619)
+++ 	(revision )
@@ -1,216 +1,0 @@
-#
-# Configuracoes principais
-#
-Options -ExecCGI -MultiViews -Indexes
-DirectoryIndex index.php index.html index.htm
-DefaultLanguage pt-BR
-AddDefaultCharset ISO-8859-1
-ServerSignature Off
-
-#
-# Configuracoes de "headers", cache e outras otimizacoes
-#
-# Disable caches and browsers from being able to validate files,
-# so they are forced to rely on your Cache-Control and Expires header.
-<ifModule mod_headers.c>
-	Header unset ETag
-</ifModule>
-FileETag None
-
-#-> http://www.htaccesselite.com/htaccess/cache-control-http-headers-vt65.html
-#      300   5 M
-#     2700  45 M
-#     3600   1 H
-#    54000  15 H
-#    86400   1 D
-#   518400   6 D
-#   604800   1 W
-#  1814400   3 W
-#  2419200   1 M
-# 26611200  11 M
-# 29030400   1 Y (never expire)
-
-## HEADER CACHING ##
-#-> http://www.htaccesselite.com/htaccess/caching-using-header-vt2.html
-#<FilesMatch "\.(flv|gif|jpg|jpeg|png|ico)$">
-#	Header set Cache-Control "max-age=2592000"
-#</FilesMatch>
-#<FilesMatch "\.(js|css|pdf|swf)$">
-#   Header set Cache-Control "max-age=604800"
-#</FilesMatch>
-#<FilesMatch "\.(html|htm|txt)$">
-#   Header set Cache-Control "max-age=600"
-#</FilesMatch>
-#<FilesMatch "\.(pl|php|cgi|spl|scgi|fcgi)$">
-#   Header unset Cache-Control
-#</FilesMatch>
-
-## ALTERNATE EXPIRES CACHING ##
-#-> htaccesselite.com/d/use-htaccess-to-speed-up-your-site-discussion-vt67.html
-#<ifModule mod_expires.c>
-#	ExpiresActive On
-#	ExpiresDefault A0
-#	ExpiresDefault "access plus 1 day"
-	# Permite que os arquivos sejam "cacheados" tanto para http quanto para https
-#	Header set Cache-Control "public"
-
-#	ExpiresByType text/html "access plus 1 hour"
-#	ExpiresByType text/plain "access plus 1 hour"
-#	ExpiresByType text/css "access plus 1 hour"
-#	ExpiresByType text/javascript "access plus 1 hour"
-#	ExpiresByType application/x-javascript "access plus 1 hour"
-
-#	ExpiresByType image/gif "access plus 1 week"
-#	ExpiresByType image/jpg "access plus 1 week"
-#	ExpiresByType image/png "access plus 1 week"
-
-	#<FilesMatch "\.(pl|php|cgi|spl|scgi|fcgi)$">
-		#ExpiresActive Off
-		# Sem cache!
-		#ExpiresDefault A0
-		#Header set Cache-Control "no-store, no-cache, must-revalidate, max-age=0"
-		#Header set Pragma "no-cache"
-	#</FilesMatch>
-#</ifModule>
-
-#
-# Compactacao
-#
-<IfModule mod_deflate.c>
-	SetOutputFilter DEFLATE
-
-	AddOutputFilterByType DEFLATE application/x-httpd-php
-	AddOutputFilterByType DEFLATE application/x-javascript
-	AddOutputFilterByType DEFLATE application/x-httpd-fastphp
-	AddOutputFilterByType DEFLATE application/xhtml+xml
-	AddOutputFilterByType DEFLATE application/xml
-	AddOutputFilterByType DEFLATE application/rss+xml
-	AddOutputFilterByType DEFLATE application/atom_xml
-	AddOutputFilterByType DEFLATE text/html
-	AddOutputFilterByType DEFLATE text/plain
-	AddOutputFilterByType DEFLATE text/xml
-	AddOutputFilterByType DEFLATE text/css
-	AddOutputFilterByType DEFLATE image/svg+xml
-
-	# Use low settings for compression to make sure impact on server is low
-	#DeflateMemLevel 2
-	#Highest 9 - Lowest 1
-	#DeflateCompressionLevel 9
-
-	#Skip browsers with known problems
-	BrowserMatch ^Mozilla/4 gzip-only-text/html
-	BrowserMatch ^Mozilla/4\.0[678] no-gzip
-	BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
-
-	# properly handle requests coming from behind proxies
-	<IfModule mod_headers.c>
-		# Make sure proxies don't deliver the wrong content
-		Header append Vary User-Agent env=!dont-vary
-	</IfModule>
-
-	SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip dont-vary
-	SetEnvIfNoCase Request_URI \.(?:exe|t?gz|zip|bz2|sit|rar)$ no-gzip dont-vary
-	SetEnvIfNoCase Request_URI \.(?:avi|mov|mp3|ogg|wmv|wma)$ no-gzip dont-vary
-	SetEnvIfNoCase Request_URI \.pdf$ no-gzip dont-vary
-
-	# Log file compression
-#	DeflateFilterNote Input instream
-#	DeflateFilterNote Output outstream
-#	DeflateFilterNote Ratio ratio
-#	LogFormat '"%r" %{outstream}n/%{instream}n (%{ratio}n%%)' deflate
-#	CustomLog /var/log/apache2/deflate.log deflate
-
-</ifModule>
-
-
-#
-# Reescritas e redirecionamentos
-#
-RewriteEngine On
-## DENY REQUEST BASED ON REQUEST METHOD ##
-RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK|HEAD)$ [NC]
-RewriteRule ^.*$ - [F]
-RewriteRule ^rest(.*)$ prototype/rest/$1 [QSA,L]
-RewriteRule ^Microsoft-Server-ActiveSync(.*) zpush/index.php$1 [E=ACTIVESYNC:true,E=REMOTE_USER:%{HTTP:Authorization}]
-
-#
-# Seguranca e restricoes de acesso
-#
-# Ao prÃ³prio htaccess e outros arquivos sensiveis (como senhas)
-<Files ~ "\.(htaccess|htpasswd|ini|srv|log|sh|svn)$">
-	Order Allow,Deny
-	Deny from all
-	Satisfy any
-</Files>
-
-#<Location /setup>
-#	Options None
-#        Order deny,allow
-#	# Sua rede local
-#        allow from 192.168.0.0/24
-#</Location>
-
-#
-# Configuracoes do PHP para o Expresso
-# IMPORTANTE: estas configuraÃ§Ãµes nÃ£o serÃ£o carregadas
-#  em ambientes que executam o PHP via FastCGI, FPM,
-#  ou similares. Nestes casos, estas configuraÃ§Ãµes
-#  devem ser adicionadas diretamente ao php.ini.
-#
-<IfModule mod_php5.c>
-	# Configuracoes de sessao
-	php_flag session.auto_start Off
-	php_flag session.use_cookies Off
-	# Uses dir as a session handler
-	php_value session.save_handler "files"
-	php_value session.save_path "/dev/shm"
-	# Use memcache as a session handler
-	#php_value session.save_handler "memcache"
-	#php_value session.save_path "tcp://localhost:11211?persistent=1&weight=1&timeout=1&retry_interval=15"
-	php_value session.serialize_handler "php"
-	php_value session.gc_probability 1
-	php_value session.gc_divisor 100
-	php_value session.gc_maxlifetime 14400
-	php_value session.cache_limiter nocache
-	php_value session.cache_expire 180
-	php_flag session.use_trans_sid Off
-
-	php_flag short_open_tag On
-	php_flag zlib.output_compression Off
-	php_flag output_buffering Off
-	php_flag register_argc_argv On
-	php_flag allow_url_include Off
-	php_value variables_order "EGPCS"
-	php_value default_charset "iso-8859-1"
-	php_value default_mimetype "text/html"
-	php_value date.timezone "America/Sao_Paulo"
-	php_value url_rewriter.tags "a=href,area=href,frame=src,form=,fieldset="
-	#php_value url_rewriter.tags "a=href,area=href,frame=src,input=src,form=,fieldset="
-
-	php_value mbstring.func_overload "0"
-	#php_value mbstring.func_overload "7"
-	#php_flag mbstring.strict_detection On
-
-	php_value max_execution_time 90
-	php_value max_input_time 120
-	php_value memory_limit 196M
-	php_value post_max_size 50M
-	php_value upload_max_filesize 40M
-
-	# Para ambiente de desenvolvimento
-	#php_flag log_errors On
-	#php_value error_reporting "E_ALL & ~E_NOTICE"
-	#php_flag ignore_repeated_errors On
-	#php_flag report_memleaks On
-	#php_flag html_errors On
-	#php_value error_log /tmp/php.log
-
-	# deprecate 5.3.0, removed 5.4.0
-	php_flag magic_quotes_gpc Off
-	php_flag magic_quotes_runtime Off
-	php_flag register_globals Off
-	php_flag register_long_arrays Off
-	php_flag allow_call_time_pass_reference On
-	php_flag session.bug_compat_42 0
-	php_flag session.bug_compat_warn 0
-</IfModule>
Index: unk/help.php
===================================================================
--- /trunk/help.php	(revision 5509)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?php
-		/*************************************************************************** 
-		* Expresso Livre                                                           * 
-		* http://www.expressolivre.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.                                              * 
-		\**************************************************************************/ 
-		
-$GLOBALS['phpgw_info']['flags'] = array(
-	'disable_Template_class' => True,
-	'login'                  => True,
-	'currentapp'             => 'login',
-	'noheader'               => True
-);
-	require_once('./header.inc.php');
-	$GLOBALS['phpgw_info']['server']['template_dir'] = PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['login_template_set'];
-	$tmpl = CreateObject('phpgwapi.Template', $GLOBALS['phpgw_info']['server']['template_dir']);
-	$tmpl->set_file(array('login_form' => 'help.tpl'));
-	$tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']);
-    $tmpl->set_var('template_set',$GLOBALS['phpgw_info']['login_template_set']);
-	$GLOBALS['phpgw']->translation->init();
-	$GLOBALS['phpgw']->translation->add_app('loginhelp');
-	$GLOBALS['phpgw']->translation->add_app('loginhelp',$_GET['lang']);
-	if(lang('loginhelp_message') != 'loginhelp_message*')
-	{
-		$tmpl->set_var('login_help',lang('loginhelp_message'));
-	}
-	$tmpl->pfp('loginout','login_form');
-?>
-
Index: unk/robots.txt
===================================================================
--- /trunk/robots.txt	(revision 2)
+++ 	(revision )
@@ -1,2 +1,0 @@
-User-agent: *
-Disallow: /
Index: unk/prototype.php
===================================================================
--- /trunk/prototype.php	(revision 7681)
+++ 	(revision )
@@ -1,1 +1,0 @@
-<?php require_once 'prototype/REST.php' ?>
Index: unk/index.php
===================================================================
--- /trunk/index.php	(revision 7655)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?php
-	/**************************************************************************\
-	* phpGroupWare                                                             *
-	* http://www.phpgroupware.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.                                              *
-	\**************************************************************************/
-	
-	$current_url = substr($_SERVER["SCRIPT_NAME"], 0, strpos($_SERVER["SCRIPT_NAME"],'index.php'));
-
-	$phpgw_info = array();
-	if(!file_exists('header.inc.php'))
-	{
-		Header('Location: '.$current_url.'setup/index.php');
-		exit;
-	}
-
-	$GLOBALS['sessionid'] = isset($_GET['sessionid']) ? $_GET['sessionid'] : @$_COOKIE['sessionid'];
-	if(!$GLOBALS['sessionid'])
-	{
-		Header('Location: '.$current_url.'login.php'.
-		(isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING']) ?
-		'?phpgw_forward='.urlencode('/index.php?'.$_SERVER['QUERY_STRING']):''));
-		exit;
-	}
-
-	/*
-		This is the menuaction driver for the multi-layered design
-	*/
-	if(isset($_GET['menuaction']))
-	{
-		list($app,$class,$method) = explode('.',@$_GET['menuaction']);
-		if(! $app || ! $class || ! $method)
-		{
-			$invalid_data = True;
-		}
-	}
-	else
-	{
-	//$phpgw->log->message('W-BadmenuactionVariable, menuaction missing or corrupt: %1',$menuaction);
-	//$phpgw->log->commit();
-
-		$app = 'home';
-		$invalid_data = True;
-	}
-
-	if($app == 'phpgwapi')
-	{
-		$app = 'home';
-		$api_requested = True;
-	}
-
-	$GLOBALS['phpgw_info']['flags'] = array(
-		'noheader'   => True,
-		'nonavbar'   => True,
-		'currentapp' => $app
-	);
-	include('./header.inc.php');
-
-	if (($GLOBALS['phpgw_info']['server']['use_https'] == 2) && ($_SERVER['HTTPS'] != 'on'))
-	{
-	
-		Header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-		exit;
-	}
-
-	if($app == 'home' && !$api_requested)
-	{
-		if( $_GET['dont_redirect_if_moble'] == 1 )
-			Header('Location: ' . $GLOBALS['phpgw']->link('/home.php?dont_redirect_if_moble=1'));
-		else
-			Header('Location: ' . $GLOBALS['phpgw']->link('/home.php'));
-	}
-
-	if($api_requested)
-	{
-		$app = 'phpgwapi';
-	}
-
-	$GLOBALS[$class] = CreateObject(sprintf('%s.%s',$app,$class));
-	if((is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions[$method]) && ! $invalid_data)
-	{
-		execmethod($_GET['menuaction']);
-		unset($app);
-		unset($class);
-		unset($method);
-		unset($invalid_data);
-		unset($api_requested);
-	}
-	else
-	{
-		if(!$app || !$class || !$method)
-		{
-			if(@is_object($GLOBALS['phpgw']->log))
-			{
-				if($menuaction)
-                {			
-					$GLOBALS['phpgw']->log->message(array(
-						'text' => "W-BadmenuactionVariable, menuaction missing or corrupt: $menuaction",
-						'p1'   => $menuaction,
-						'line' => __LINE__,
-						'file' => __FILE__
-					));
-                }
-			}
-		}
-
-		if(!is_array($GLOBALS[$class]->public_functions) || ! $$GLOBALS[$class]->public_functions[$method] && $method)
-		{
-			if(@is_object($GLOBALS['phpgw']->log))
-			{				
-			 	if($menuaction)
-                {			
-					$GLOBALS['phpgw']->log->message(array(
-						'text' => "W-BadmenuactionVariable, attempted to access private method: $method",
-						'p1'   => $method,
-						'line' => __LINE__,
-						'file' => __FILE__
-					));
-                }
-			}
-		}
-		if(@is_object($GLOBALS['phpgw']->log))
-		{
-			$GLOBALS['phpgw']->log->commit();
-		}
-
-		if( $_GET['dont_redirect_if_moble'] == 1 )
-			Header('Location: ' . $GLOBALS['phpgw']->link('/home.php?dont_redirect_if_moble=1'));
-		else
-			Header('Location: ' . $GLOBALS['phpgw']->link('/home.php'));
-				
-		//$GLOBALS['phpgw']->redirect_link('/home.php');
-	}
-
-	/*if(!isset($GLOBALS['phpgw_info']['nofooter']))
-	{
-		$GLOBALS['phpgw']->common->phpgw_footer();
-	}*/
-
-		if($_GET['menuaction']){
-			$modulo = explode('.', $_GET['menuaction']);
-			
-			if($modulo[0] == 'expressoAdmin1_2' || $modulo[0] == 'calendar'){
-				echo '<script type="text/javascript" src="prototype/plugins/jquery/jquery.min.js"></script>
-					  <script type="text/javascript" src="prototype/plugins/jquery/jquery-ui.min.js"></script>
-					  <link rel="stylesheet" href="prototype/plugins/jqgrid/themes/prognusone/jquery-ui-1.8.2.custom.css" type="text/css" />
-					  <script src="prototype/plugins/json2/json2.js" language="javascript"></script>
-					  <script src="prototype/plugins/ejs/ejs.js" language="javascript"></script>
-					  <script src="prototype/plugins/store/jquery.store.js" language="javascript"></script>
-					  <script type="text/javascript" src="prototype/api/rest.js"></script>
-					  <script src="prototype/api/datalayer.js" language="javascript"></script>
-					  <script type="text/javascript">DataLayer.dispatchPath = "/"; REST.dispatchPath = "prototype/";REST.load("")</script>
-					  <link rel="stylesheet" type="text/css" href="prototype/plugins/zebradialog/css/zebra_dialog.css"></link>
-					  <script type="text/javascript" src="prototype/plugins/zebradialog/javascript/zebra_dialog.js"></script>	
-					  <script type="text/javascript" src="calendar/templates/default/js/quickSearch.js"></script>
-					 <script src="expressoMail1_2/js/ccQuickAdd.js" type="text/javascript"></script>
-					';
-				if($modulo[0] == 'calendar'){
-                    echo '<link rel="stylesheet" href="prototype/plugins/jquery.jrating/jRating.jquery.css" type="text/css" />
-                    <script type="text/javascript" src="prototype/plugins/jquery.jrating/jRating.jquery.js"></script>
-                    <script src="expressoMail1_2/js/common_functions.js" type="text/javascript"></script>
-                    <script type="text/javascript">userContacts = false; currentTypeContact = ""; REST.get("/usercontacts", false, updateDynamicContact);</script>';
-                }
-
-		}
-	}
-?>
Index: unk/about.php
===================================================================
--- /trunk/about.php	(revision 7681)
+++ 	(revision )
@@ -1,140 +1,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.                                              *
-   \**************************************************************************/
-
-
-   $GLOBALS['phpgw_info'] = array();
-   $GLOBALS['phpgw_info']['flags']['currentapp'] = 'about';
-   $GLOBALS['phpgw_info']['flags']['disable_Template_class'] = True;
-   $GLOBALS['phpgw_info']['flags']['noheader'] = True;
-   include('header.inc.php');
-
-   $app = $_GET['app'];
-   if ($app)
-   {
-	  if (!($included = $GLOBALS['phpgw']->hooks->single('about',$app)))
-	  {
-		 function about_app()
-		 {
-			global $app;
-			$icon = $GLOBALS['phpgw']->common->image($app,array('navbar','nonav'));
-			include (PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php");
-			$info = $setup_info[$app];
-			$info['title'] = $GLOBALS['phpgw_info']['apps'][$app]['title'];
-			$other_infos = array(
-			   'author'     => lang('Author'),
-			   'maintainer' => lang('Maintainer'),
-			   'version'    => lang('Version'),
-			   'license'    => lang('License')
-			);
-
-			$s = "<table width='70%' cellpadding='4'>\n<tr>
-				  <td align='left'><img src='$icon' alt=\"$info[title]\" /></td><td align='left'><h2>{$info['title']}</h2></td></tr>";
-
-			   if ($info['description'])
-			   {
-				  $info['description'] = lang($info['description']);
-				  $s .= "<tr><td colspan='2' align='left'>{$info['description']}</td></tr>\n";
-				  if ($info['note'])
-				  {
-					 $info['note'] = lang($info['note']);
-					 $s .= "<tr><td colspan='2' align='left'><i>{$info['note']}</i></td></tr>\n";
-				  }
-
-			   }
-			   
-
-			   foreach ($other_infos as $key => $val)
-			   {
-				  if (isset($info[$key]))
-				  {
-					 $s .= "<tr><td width='1%' align='left'>$val</td><td>";
-						   $infos = $info[$key];
-						   for ($n = 0; is_array($info[$key][$n]) && ($infos = $info[$key][$n]) || !$n; ++$n)
-						   {
-							  if (!is_array($infos) && isset($info[$key.'_email']))
-							  {
-								 $infos = array('email' => $info[$key.'_email'],'name' => $infos);
-							  }
-							  if (is_array($infos))
-							  {
-								 $names = explode('<br>',$infos['name']);
-								 $emails = preg_split('/@|<br>/',$infos['email']);
-								 if (count($names) < count($emails)/2)
-								 {
-									$names = '';
-								 }
-								 $infos = '';
-								 while (list($user,$domain) = $emails)
-								 {
-									if ($infos) $infos .= '<br>';
-									$name = $names ? array_shift($names) : $user;
-									$infos .= "<a href='mailto:$user at $domain'><span onClick=\"document.location='mailto:$user'+'@'+'$domain'; return false;\">$name</span></a>";
-									array_shift($emails); array_shift($emails);
-								 }
-							  }
-							  $s .= ($n ? '<br>' : '') . $infos;
-						   }
-						   $s .= "</td></tr>\n";
-				  }
-			   }
-
-			   if ($info['extra_untranslated'])
-			   {
-				  $s .= "<tr><td colspan='2' align='left'>{$info['extra_untranslated']}</td></tr>\n";
-			   }
-			   
-			   $s .= "</table>\n";
-
-			return $s;
-		 }
-		 $api_only = !($included = file_exists(PHPGW_INCLUDE_ROOT . "/$app/setup/setup.inc.php"));
-	  }
-   }
-   else
-   {
-	  $api_only = True;
-   }
-
-   $tpl = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi'));
-   $tpl->set_file(array(
-	  'phpgw_about'         => 'about.tpl',
-	  'phpgw_about_unknown' => 'about_unknown.tpl'
-   ));
-
-   $tpl->set_var('phpgw_logo',$GLOBALS['phpgw']->common->image('phpgwapi','logo.gif'));
-   $tpl->set_var('phpgw_version',lang('eGroupWare API version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']));
-   $tpl->set_var('phpgw_message',lang('%1eGroupWare%2 is a multi-user, web-based groupware suite written in %3PHP%4.',
-   '<a href="http://www.eGroupWare.org" target="_blank">','</a>','<a href="http://www.php.net" target="_blank">','</a>'));
-
-   if ($included)
-   {
-	  $tpl->set_var('phpgw_app_about',about_app('',''));
-	  //about_app($tpl,"phpgw_app_about");
-   }
-   else
-   {
-	  if ($api_only)
-	  {
-		 $tpl->set_var('phpgw_app_about','');
-	  }
-	  else
-	  {
-		 $tpl->set_var('app_header',$app);
-		 $tpl->parse('phpgw_app_about','phpgw_about_unknown');
-	  }
-   }
-
-   $title = isset($GLOBALS['phpgw_info']['apps'][$app]) ? $GLOBALS['phpgw_info']['apps'][$app]['title'] : 'eGroupWare';
-   $GLOBALS['phpgw_info']['flags']['app_header'] = lang('About %1',$title);
-   $GLOBALS['phpgw']->common->phpgw_header();
-   $tpl->pparse('out','phpgw_about');
-   $GLOBALS['phpgw']->common->phpgw_footer();
-?>
Index: unk/home.php
===================================================================
--- /trunk/home.php	(revision 7673)
+++ 	(revision )
@@ -1,188 +1,0 @@
-<?php
-	/**************************************************************************\
-	* eGroupWare                                                               *
-	* http://www.egroupware.org                                                *
-	* The file written by Joseph Engo <jengo@phpgroupware.org>                 *
-	* This file modified by Greg Haygood <shrykedude@bellsouth.net>            *
-	* --------------------------------------------                             *
-	*  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.                                              *
-	\**************************************************************************/
-	$phpgw_info = array();
-	$current_url = substr($_SERVER["SCRIPT_NAME"], 0, strpos($_SERVER["SCRIPT_NAME"],'home.php'));
-
-	if (!is_file('header.inc.php'))
-	{
-		Header('Location: '.$current_url.'setup/index.php');
-		exit;
-	}
-
-	$GLOBALS['sessionid'] = @$_GET['sessionid'] ? $_GET['sessionid'] : @$_COOKIE['sessionid'];
-	if (!isset($GLOBALS['sessionid']) || !$GLOBALS['sessionid'])
-	{
-		Header('Location: '.$current_url.'login.php?cd=10');
-		exit;
-	}
-
-	$GLOBALS['phpgw_info']['flags'] = array(
-		'noheader'                => True,
-		'nonavbar'                => True,
-		'currentapp'              => 'home',
-		'enable_network_class'    => True,
-		'enable_contacts_class'   => True,
-		'enable_nextmatchs_class' => True
-	);
-	include('header.inc.php');
-	
-	//detect browser
-	require_once('phpgwapi/inc/class.browser.inc.php');
-	
-	$ifMobile	= false;
-	$browser	= new browser();
-	
-	
-	switch( $browser->get_platform() )
-	{
-		case browser::PLATFORM_IPHONE:
-		case browser::PLATFORM_IPOD:
-		case browser::PLATFORM_IPAD:
-		case browser::PLATFORM_BLACKBERRY:
-		case browser::PLATFORM_ANDROID:						
-			$ifMobile = false;
-			break;			
-	}
-	
-	if( $ifMobile )
-	{
-		if( $_GET['dont_redirect_if_moble'] != 1 )
-		{
-			$GLOBALS['phpgw']->redirect('/mobile/index.php');
-			exit;			
-		}
-	} 
-	
-	
-	$GLOBALS['phpgw_info']['flags']['app_header']=lang('home');
-
-	// Commented by alpeb: The following prevented anonymous users to get a home page. Perhaps it was done with anonymous users such as the ones
-	// used by  wiki and sitemgr in mind. However, if you mark a normal user as anonymous just to avoid being shown in sessions and access log (like you would for an admin that doesn't want to be noticed), the user won't be able to login anymore. That's why I commented the code.
-	/*if ($GLOBALS['phpgw']->session->session_flags == 'A')
-	{
-		if ($_SERVER['HTTP_REFERER'] && strstr($_SERVER['HTTP_REFERER'],'home.php') === False)
-		{
-			$GLOBALS['phpgw']->redirect($_SERVER['HTTP_REFERER']);
-		}
-		else
-		{
-			// redirect to the login-page, better then giving an empty page
-			$GLOBALS['phpgw']->redirect('login.php');
-		}
-		exit;
-	}*/
-
-	if ($GLOBALS['phpgw_info']['server']['force_default_app'] && $GLOBALS['phpgw_info']['server']['force_default_app'] != 'user_choice')
-	{
-		$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] = $GLOBALS['phpgw_info']['server']['force_default_app'];
-	}
-
-	if ($_GET['cd']=='yes' && $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] &&
-		$GLOBALS['phpgw_info']['user']['apps'][$GLOBALS['phpgw_info']['user']['preferences']['common']['default_app']])
-	{
-		$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/' . $GLOBALS['phpgw_info']['user']['preferences']['common']['default_app'] . '/' . 'index.php'));
-	}
-	else
-	{
-		$GLOBALS['phpgw']->common->phpgw_header();
-		echo parse_navbar();
-	}
-
-        // Default Applications (Home Page) 
-        $default_apps = Array(                  
-                        'workflow',                     
-                        'expressoMail1_2',
-                        'calendar',
-                        'news_admin'
-                );
-        $sorted_apps = array();
-        $user_apps = $GLOBALS['phpgw_info']['user']['apps']; 
-        @reset($user_apps);
-        $default_apps_count = count($default_apps);
-        for($i = 0; $i < $default_apps_count;++$i) {
-                if(array_key_exists($default_apps[$i], $user_apps)){
-                        $sorted_apps[] = $default_apps[$i];
-                }               
-        }
-        
-        foreach($GLOBALS['phpgw_info']['user']['apps'] as $i => $p) {
-                $sorted_apps[] = $p['name'];
-        }
-
-	$portal_oldvarnames = array('mainscreen_showevents', 'homeShowEvents','homeShowLatest','mainscreen_showmail','mainscreen_showbirthdays','mainscreen_show_new_updated');
-        $done = array();
-        // Display elements, within appropriate table cells     
-        @reset($sorted_apps);
-        $idx = 1;
-        echo "<table width='100%' cellpadding=5>";
-        foreach($sorted_apps as $appname)
-        {
-                if((int)$done[$appname] == 1 || empty($appname)){
-                        continue;
-                }
-                $varnames = $portal_oldvarnames;
-                $varnames[] = 'homepage_display';
-                $thisd = 0;
-                $tmp = '';
-
-                foreach($varnames as $varcheck)
-                {
-
-                        /*if($appname == 'expressoMail1_2') {
-                                $tmp = $appname;
-                                $appname = 'expressoMail';
-                        }*/
-
-                        if(array_search($appname, $default_apps) !== False){
-                                $thisd = 1;
-                                break;
-                        }
-                        if($GLOBALS['phpgw_info']['user']['preferences'][$appname][$varcheck]=='True') {
-                                $thisd = 1;
-                                break;
-                        }
-                        else  {
-                                $_thisd = (int)$GLOBALS['phpgw_info']['user']['preferences'][$appname][$varcheck];
-                                if($_thisd > 0) {
-                                        $thisd = $_thisd;
-                                        break;
-                                }
-                        }
-                }
-
-               if($thisd > 0)
-                {
-                        if($tmp) {
-                $appname = $tmp;
-                                $tmp = '';
-                        }
-                        if($idx == 0) {
-                                print '<tr>';
-                        }
-                        print '<td style="vertical-align:top;" width="45%">';
-                        $GLOBALS['phpgw']->hooks->single('home',$appname);
-                        print '</td>';
-
-                        if($idx == 2){
-                                $idx = 0;
-                                print '</tr>';
-                        }
-                        ++$idx;
-                        $neworder[] = $appname;
-                }
-                $done[$appname] = 1;
-        }
-        print '</table>';
-
-	$GLOBALS['phpgw']->common->phpgw_footer();
-?>
