[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6465] merge 6448:6464 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6465] merge 6448:6464 from trunk |
|
Date: |
Sun, 10 Oct 2010 17:22:31 +0000 |
Revision: 6465
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6465
Author: sigurdne
Date: 2010-10-10 17:22:31 +0000 (Sun, 10 Oct 2010)
Log Message:
-----------
merge 6448:6464 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/booking/setup/tables_current.inc.php
branches/Version-1_0-branch/felamimail/setup/tables_update.inc.php
branches/Version-1_0-branch/login.php
branches/Version-1_0-branch/notes/inc/class.uinotes.inc.php
branches/Version-1_0-branch/notes/templates/base/app_data.xsl
branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.historylog.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.interserver.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.log.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.menu.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.ping.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_oracle.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup_process.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.setup_translation.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.shm.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.uijsaddressbook.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.validator.inc.php
branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
branches/Version-1_0-branch/phpgwapi/setup/default_records.inc.php
branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
branches/Version-1_0-branch/phpgwapi/templates/base/css/login.css
branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.inc.php
branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.tpl
branches/Version-1_0-branch/property/inc/class.bogab.inc.php
branches/Version-1_0-branch/property/inc/class.solocation.inc.php
branches/Version-1_0-branch/property/setup/default_records.inc.php
branches/Version-1_0-branch/setup/applications.php
branches/Version-1_0-branch/setup/config.php
branches/Version-1_0-branch/setup/inc/functions.inc.php
branches/Version-1_0-branch/todo/setup/tables_update.inc.php
Added Paths:
-----------
branches/Version-1_0-branch/phpgwapi/templates/base/css/ie6.css
branches/Version-1_0-branch/phpgwapi/templates/base/css/ie7.css
branches/Version-1_0-branch/phpgwapi/templates/base/css/joomla_general.css
branches/Version-1_0-branch/phpgwapi/templates/base/css/rounded.css
branches/Version-1_0-branch/phpgwapi/templates/base/css/system.css
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_border.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_bottom.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_button1_left.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_button1_next.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_corner_bl.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_corner_br.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_bl_dark.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_bl_light.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_bl_med.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_br_dark.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_br_light.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_br_med.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tl_dark.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tl_light.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tl_med.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tr_dark.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tr_light.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tr_med.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_header_left.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_header_middle.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_header_right.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_login_lock.jpg
branches/Version-1_0-branch/phpgwapi/templates/base/images/notice-alert.png
branches/Version-1_0-branch/phpgwapi/templates/base/images/notice-info.png
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:6439-6441,6443,6445-6447
+ /trunk:6439-6441,6443,6445-6447,6449-6464
Modified: branches/Version-1_0-branch/booking/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/booking/setup/tables_current.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -22,13 +22,13 @@
'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
'homepage' => array('type' => 'text',
'nullable' => False),
'location_code' => array('type' =>
'varchar','precision' => '50','nullable' => True),
- 'phone' => array('type' =>
'varchar','precision' => '50','nullable' => False, 'default'=>''),
- 'email' => array('type' =>
'varchar','precision' => '50','nullable' => False, 'default'=>''),
- 'street' => array('type' =>
'varchar','precision' => '255', 'nullable' => False, 'default'=>''),
- 'zip_code' => array('type' =>
'varchar','precision' => '255', 'nullable' => False, 'default'=>''),
- 'district' => array('type' =>
'varchar','precision' => '255', 'nullable' => False, 'default'=>''),
- 'city' => array('type' => 'varchar','precision'
=> '255', 'nullable' => False, 'default'=>''),
- 'description' => array('type' => 'text',
'nullable' => False, 'default'=>''),
+ 'phone' => array('type' =>
'varchar','precision' => '50','nullable' => True),
+ 'email' => array('type' =>
'varchar','precision' => '50','nullable' => True),
+ 'street' => array('type' =>
'varchar','precision' => '255', 'nullable' => True),
+ 'zip_code' => array('type' =>
'varchar','precision' => '255', 'nullable' => True),
+ 'district' => array('type' =>
'varchar','precision' => '255', 'nullable' => True),
+ 'city' => array('type' => 'varchar','precision'
=> '255', 'nullable' => True),
+ 'description' => array('type' => 'text',
'nullable' => True),
),
'pk' => array('id'),
'fk' => array(),
@@ -54,9 +54,9 @@
'ssn' => array('type' => 'varchar', 'precision'
=> '12', 'nullable' => True,),
'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
'homepage' => array('type' => 'text',
'nullable' => True),
- 'phone' => array('type' =>
'varchar','precision' => '50','nullable' => False, 'default'=>''),
- 'email' => array('type' =>
'varchar','precision' => '50','nullable' => False, 'default'=>''),
- 'description' => array('type' =>
'varchar','precision' => '1000','nullable' => False, 'default'=>''),
+ 'phone' => array('type' =>
'varchar','precision' => '50','nullable' => True),
+ 'email' => array('type' =>
'varchar','precision' => '50','nullable' => True),
+ 'description' => array('type' =>
'varchar','precision' => '1000','nullable' => True),
),
'pk' => array('id'),
'fk' => array(),
@@ -70,13 +70,13 @@
'active' => array('type' => 'int', 'nullable'
=> False,'precision' => '4', 'default' => 1),
'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
'homepage' => array('type' => 'text',
'nullable' => True),
- 'phone' => array('type' =>
'varchar','precision' => '50','nullable' => False, 'default'=>''),
- 'email' => array('type' =>
'varchar','precision' => '50','nullable' => False, 'default'=>''),
- 'street' => array('type' =>
'varchar','precision' => '255', 'nullable' => False, 'default'=>''),
- 'zip_code' => array('type' =>
'varchar','precision' => '255', 'nullable' => False, 'default'=>''),
- 'district' => array('type' =>
'varchar','precision' => '255', 'nullable' => False, 'default'=>''),
- 'city' => array('type' => 'varchar','precision'
=> '255', 'nullable' => False, 'default'=>''),
- 'description' => array('type' => 'text',
'nullable' => False, 'default'=>''),
+ 'phone' => array('type' =>
'varchar','precision' => '50','nullable' => True),
+ 'email' => array('type' =>
'varchar','precision' => '50','nullable' => True),
+ 'street' => array('type' =>
'varchar','precision' => '255', 'nullable' => True),
+ 'zip_code' => array('type' =>
'varchar','precision' => '255', 'nullable' => True),
+ 'district' => array('type' =>
'varchar','precision' => '255', 'nullable' => True),
+ 'city' => array('type' => 'varchar','precision'
=> '255', 'nullable' => True),
+ 'description' => array('type' => 'text',
'nullable' => True),
'activity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'customer_identifier_type' => array('type' =>
'varchar', 'precision' => '255', 'nullable' => True),
'customer_number' => array('type' => 'text',
'nullable' => True),
@@ -98,7 +98,7 @@
'building_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
'type' => array('type' => 'varchar',
'precision' => '50', 'nullable' => False),
- 'description' => array('type' => 'text',
'nullable' => False, 'default'=>''),
+ 'description' => array('type' => 'text',
'nullable' => True),
'activity_id' => array('type' =>
'int','precision' => '4','nullable' => False),
'sort' => array('type' => 'int','precision' =>
'4','nullable' => False,'default' => 0),
),
@@ -114,7 +114,7 @@
'id' => array('type' => 'auto', 'nullable' =>
false),
'active' => array('type' => 'int', 'nullable'
=> False,'precision' => '4', 'default' => 1),
'organization_id' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'description' => array('type' => 'text',
'nullable' => False, 'default'=>''),
+ 'description' => array('type' => 'text',
'nullable' => True),
'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
'activity_id' => array('type' =>
'int','precision' => '4','nullable' => True),
'shortname' => array('type' =>
'varchar','precision' => '11', 'nullable' => True),
@@ -475,10 +475,10 @@
'bb_organization_contact' => array(
'fd' => array(
'id' => array('type' => 'auto', 'nullable' =>
false),
- 'name' => array('type' => 'varchar',
'precision' => '50', 'nullable' => false, 'default'=>''),
- 'ssn' => array('type' => 'varchar',
'precision' => '12', 'nullable' => false, 'default'=>''),
- 'phone' => array('type' => 'varchar',
'precision' => '50', 'nullable' => false, 'default'=>''),
- 'email' => array('type' => 'varchar',
'precision' => '50', 'nullable' => false, 'default'=>''),
+ 'name' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
+ 'ssn' => array('type' => 'varchar',
'precision' => '12', 'nullable' => True),
+ 'phone' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
+ 'email' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
'organization_id' => array('type' => 'int',
'precision' => '4', 'nullable' => false),
),
'pk' => array('id'),
@@ -491,9 +491,9 @@
'bb_group_contact' => array(
'fd' => array(
'id' => array('type' => 'auto', 'nullable' =>
false),
- 'name' => array('type' => 'varchar',
'precision' => '50', 'nullable' => false, 'default'=>''),
- 'phone' => array('type' => 'varchar',
'precision' => '50', 'nullable' => false, 'default'=>''),
- 'email' => array('type' => 'varchar',
'precision' => '50', 'nullable' => false, 'default'=>''),
+ 'name' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
+ 'phone' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
+ 'email' => array('type' => 'varchar',
'precision' => '50', 'nullable' => True),
'group_id' => array('type' => 'int',
'precision' => '4', 'nullable' => false),
),
'pk' => array('id'),
Modified: branches/Version-1_0-branch/felamimail/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/felamimail/setup/tables_update.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/felamimail/setup/tables_update.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -14,8 +14,8 @@
$test[] = '0.8.2';
function felamimail_upgrade0_8_2()
{
-
$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_felamimail_cache','to_name',array('type'
=> 'varchar', 'precision' => 120));
-
$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_felamimail_cache','to_address',array('type'
=> 'varchar', 'precision' => 120));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_felamimail_cache','to_name',array('type'
=> 'varchar', 'precision' => 120));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_felamimail_cache','to_address',array('type'
=> 'varchar', 'precision' => 120));
$GLOBALS['setup_info']['felamimail']['currentver'] = '0.8.3';
return $GLOBALS['setup_info']['felamimail']['currentver'];
@@ -25,7 +25,7 @@
function felamimail_upgrade0_8_3()
{
-
$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_felamimail_cache','attachments',array('type'
=> 'varchar', 'precision' => 120));
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_felamimail_cache','attachments',array('type'
=> 'varchar', 'precision' => 120));
$GLOBALS['setup_info']['felamimail']['currentver'] = '0.8.4';
return $GLOBALS['setup_info']['felamimail']['currentver'];
@@ -41,8 +41,8 @@
$test[] = '0.9.0';
function felamimail_upgrade0_9_0()
{
-
$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus',
'accountname', array('type' => 'varchar', 'precision' => 200, 'nullable' =>
false));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache',
'accountname', array('type' => 'varchar', 'precision' => 200, 'nullable' =>
false));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus',
'accountname', array('type' => 'varchar', 'precision' => 200, 'nullable' =>
false));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_felamimail_cache',
'accountname', array('type' => 'varchar', 'precision' => 200, 'nullable' =>
false));
$GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.1';
return $GLOBALS['setup_info']['felamimail']['currentver'];
@@ -58,7 +58,7 @@
$test[] = '0.9.2';
function felamimail_upgrade0_9_2()
{
-
$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_felamimail_displayfilter',
+
$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_felamimail_displayfilter',
Array(
'fd' => array(
'accountid' => array('type' =>
'int', 'precision' => 4, 'nullable' => false),
@@ -79,9 +79,9 @@
$test[] = '0.9.3';
function felamimail_upgrade0_9_3()
{
-
$GLOBALS['egw_setup']->oProc->DropTable('phpgw_felamimail_cache');
- $GLOBALS['egw_setup']->oProc->query('delete from
phpgw_felamimail_folderstatus',__LINE__,__FILE__);
-
$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_felamimail_cache',
+
$GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_felamimail_cache');
+ $GLOBALS['phpgw_setup']->oProc->query('delete from
phpgw_felamimail_folderstatus',__LINE__,__FILE__);
+
$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_felamimail_cache',
Array(
'fd' => array(
'accountid' => array('type' =>
'int', 'precision' => 4, 'nullable' => false),
@@ -115,18 +115,45 @@
$test[] = '0.9.4';
function felamimail_upgrade0_9_4()
{
-
$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','accountname',array(
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','accountname',array(
'type' => 'varchar',
'precision' => '25',
'nullable' => False
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','date',array(
+
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT * FROM
phpgw_felamimail_cache");
+ $dates = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $dates[] = array
+ (
+ 'accountid' =>
$GLOBALS['phpgw_setup']->oProc->f('accountid'),
+ 'hostname' =>
$GLOBALS['phpgw_setup']->oProc->f('hostname'),
+ 'accountname' =>
$GLOBALS['phpgw_setup']->oProc->f('accountname'),
+ 'foldername' =>
$GLOBALS['phpgw_setup']->oProc->f('foldername'),
+ 'uid' =>
$GLOBALS['phpgw_setup']->oProc->f('uid'),
+ 'date' =>
$GLOBALS['phpgw_setup']->oProc->f('date'),
+ );
+ }
+
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_felamimail_cache',array(),'date');
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_felamimail_cache','date',array(
'type' => 'int',
'precision' => '8'
));
- $GLOBALS['setup_info']['felamimail']['currentver'] = '0.9.5';
- return $GLOBALS['setup_info']['felamimail']['currentver'];
+ foreach ($dates as $date)
+ {
+ $sql = "UPDATE phpgw_felamimail_cache SET date =
'{$date['date']}' WHERE accountid = '{$date['accountid']}' AND hostname
='{$date['hostname']}' AND accountname = '{$date['accountname']}' AND
foldername = '{$date['foldername']}' AND uid = '{$date['uid']}'";
+
$GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+ }
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['felamimail']['currentver'] =
'0.9.5';
+ return
$GLOBALS['setup_info']['felamimail']['currentver'];
+ }
}
@@ -141,20 +168,20 @@
$test[] = '1.0.0';
function felamimail_upgrade1_0_0()
{
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','accountid','fmail_accountid');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','hostname','fmail_hostname');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','accountname','fmail_accountname');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','foldername','fmail_foldername');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','uid','fmail_uid');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','subject','fmail_subject');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','striped_subject','fmail_striped_subject');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','sender_name','fmail_sender_name');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','sender_address','fmail_sender_address');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','to_name','fmail_to_name');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','to_address','fmail_to_address');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','date','fmail_date');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','size','fmail_size');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','attachments','fmail_attachments');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','accountid','fmail_accountid');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','hostname','fmail_hostname');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','accountname','fmail_accountname');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','foldername','fmail_foldername');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','uid','fmail_uid');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','subject','fmail_subject');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','striped_subject','fmail_striped_subject');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','sender_name','fmail_sender_name');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','sender_address','fmail_sender_address');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','to_name','fmail_to_name');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','to_address','fmail_to_address');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','date','fmail_date');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','size','fmail_size');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_cache','attachments','fmail_attachments');
$GLOBALS['setup_info']['felamimail']['currentver'] =
'1.0.0.001';
return $GLOBALS['setup_info']['felamimail']['currentver'];
@@ -164,15 +191,15 @@
$test[] = '1.0.0.001';
function felamimail_upgrade1_0_0_001()
{
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','accountid','fmail_accountid');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','hostname','fmail_hostname');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','accountname','fmail_accountname');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','foldername','fmail_foldername');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','messages','fmail_messages');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','recent','fmail_recent');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','unseen','fmail_unseen');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','uidnext','fmail_uidnext');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','uidvalidity','fmail_uidvalidity');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','accountid','fmail_accountid');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','hostname','fmail_hostname');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','accountname','fmail_accountname');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','foldername','fmail_foldername');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','messages','fmail_messages');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','recent','fmail_recent');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','unseen','fmail_unseen');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','uidnext','fmail_uidnext');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_folderstatus','uidvalidity','fmail_uidvalidity');
$GLOBALS['setup_info']['felamimail']['currentver'] =
'1.0.0.002';
return $GLOBALS['setup_info']['felamimail']['currentver'];
@@ -182,8 +209,8 @@
$test[] = '1.0.0.002';
function felamimail_upgrade1_0_0_002()
{
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_displayfilter','accountid','fmail_filter_accountid');
-
$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_felamimail_displayfilter','filter','fmail_filter_data');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_displayfilter','accountid','fmail_filter_accountid');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('phpgw_felamimail_displayfilter','filter','fmail_filter_data');
$GLOBALS['setup_info']['felamimail']['currentver'] =
'1.0.0.003';
return $GLOBALS['setup_info']['felamimail']['currentver'];
@@ -192,7 +219,7 @@
$test[] = '1.0.0.003';
function felamimail_upgrade1_0_0_003()
{
-
$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache',
'fmail_accountname', array('type' => 'varchar','precision' => '200','nullable'
=> False));
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_felamimail_cache',
'fmail_accountname', array('type' => 'varchar','precision' => '200','nullable'
=> False));
$GLOBALS['setup_info']['felamimail']['currentver'] =
'1.0.0.004';
return $GLOBALS['setup_info']['felamimail']['currentver'];
@@ -204,18 +231,18 @@
function felamimail_upgrade1_0_0_004()
{
// index was to big for mysql with charset utf8 (max 1000byte =
333 utf8 chars)
-
$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','fmail_accountname',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','fmail_accountname',array(
'type' => 'varchar',
'precision' => '128',
'nullable' => False
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','fmail_foldername',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_felamimail_cache','fmail_foldername',array(
'type' => 'varchar',
'precision' => '128',
'nullable' => False
));
-
$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_felamimail_cache','egw_felamimail_cache');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('phpgw_felamimail_cache','egw_felamimail_cache');
$GLOBALS['setup_info']['felamimail']['currentver'] =
'1.0.0.005';
return $GLOBALS['setup_info']['felamimail']['currentver'];
@@ -226,19 +253,19 @@
function felamimail_upgrade1_0_0_005()
{
// index was to big for mysql with charset utf8 (max 1000byte =
333 utf8 chars)
-
$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus','fmail_accountname',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus','fmail_accountname',array(
'type' => 'varchar',
'precision' => '128',
'nullable' => False
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus','fmail_foldername',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_felamimail_folderstatus','fmail_foldername',array(
'type' => 'varchar',
'precision' => '128',
'nullable' => False
));
-
$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_felamimail_folderstatus','egw_felamimail_folderstatus');
-
$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_felamimail_displayfilter','egw_felamimail_displayfilter');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('phpgw_felamimail_folderstatus','egw_felamimail_folderstatus');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('phpgw_felamimail_displayfilter','egw_felamimail_displayfilter');
$GLOBALS['setup_info']['felamimail']['currentver'] =
'1.0.0.006';
return $GLOBALS['setup_info']['felamimail']['currentver'];
@@ -257,7 +284,7 @@
$test[] = '1.2';
function felamimail_upgrade1_2()
{
- $GLOBALS['egw_setup']->oProc->CreateTable('fm_accounts',array(
+ $GLOBALS['phpgw_setup']->oProc->CreateTable('fm_accounts',array(
'fd' => array(
'fm_owner' => array('type' => 'int','precision'
=> '4','nullable' => False),
'fm_id' => array('type' => 'auto'),
@@ -288,7 +315,7 @@
$test[] = '1.2.001';
function felamimail_upgrade1_2_001()
{
-
$GLOBALS['egw_setup']->oProc->AddColumn('fm_accounts','fm_active',array(
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_accounts','fm_active',array(
'type' => 'bool',
'nullable' => False
));
@@ -300,7 +327,7 @@
$test[] = '1.2.002';
function felamimail_upgrade1_2_002()
{
-
$GLOBALS['egw_setup']->oProc->AddColumn('fm_accounts','fm_validatecertificate',array(
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('fm_accounts','fm_validatecertificate',array(
'type' => 'bool',
'nullable' => False
));
@@ -311,7 +338,7 @@
$test[] = '1.2.003';
function felamimail_upgrade1_2_003()
{
-
$GLOBALS['egw_setup']->oProc->RenameColumn('fm_accounts','fm_validatecertificate','fm_ic_validatecertificate');
+
$GLOBALS['phpgw_setup']->oProc->RenameColumn('fm_accounts','fm_validatecertificate','fm_ic_validatecertificate');
return $GLOBALS['setup_info']['felamimail']['currentver'] =
'1.2.004';
}
@@ -319,7 +346,7 @@
$test[] = '1.2.004';
function felamimail_upgrade1_2_004()
{
- $GLOBALS['egw_setup']->oProc->query('delete from
egw_felamimail_folderstatus',__LINE__,__FILE__);
+ $GLOBALS['phpgw_setup']->oProc->query('delete from
egw_felamimail_folderstatus',__LINE__,__FILE__);
return $GLOBALS['setup_info']['felamimail']['currentver'] =
'1.3.000';
}
@@ -327,19 +354,19 @@
$test[] = '1.3.000';
function felamimail_upgrade1_3_000()
{
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_sender_name',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_sender_name',array(
'type' => 'varchar',
'precision' => '256'
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_sender_address',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_sender_address',array(
'type' => 'varchar',
'precision' => '256'
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_to_name',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_to_name',array(
'type' => 'varchar',
'precision' => '256'
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_to_address',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_cache','fmail_to_address',array(
'type' => 'varchar',
'precision' => '256'
));
@@ -350,7 +377,7 @@
$test[] = '1.3.001';
function felamimail_upgrade1_3_001()
{
-
$GLOBALS['egw_setup']->oProc->RenameTable('fm_accounts','egw_felamimail_accounts');
+
$GLOBALS['phpgw_setup']->oProc->RenameTable('fm_accounts','egw_felamimail_accounts');
return $GLOBALS['setup_info']['felamimail']['currentver'] =
'1.3.002';
}
@@ -359,10 +386,10 @@
$test[] = '1.3.002';
function felamimail_upgrade1_3_002()
{
-
$GLOBALS['egw_setup']->oProc->CreateTable('egw_felamimail_signatures',array(
+
$GLOBALS['phpgw_setup']->oProc->CreateTable('egw_felamimail_signatures',array(
'fd' => array(
'fm_signatureid' => array('type' => 'auto'),
- 'fm_accountid' => array('type' =>
'int','precision' => '11'),
+ 'fm_accountid' => array('type' =>
'int','precision' => '4'),
'fm_signature' => array('type' => 'text'),
'fm_description' => array('type' =>
'varchar','precision' => '255')
),
@@ -379,13 +406,33 @@
$test[] = '1.3.003';
function felamimail_upgrade1_3_003()
{
-
#$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_encryption',array(
- # 'type' => 'int',
- # 'precision' => '4',
- # 'nullable' => False
- #));
+ $GLOBALS['phpgw_setup']->oProc->query("SELECT * FROM
egw_felamimail_accounts");
+ $accounts = array();
-
$GLOBALS['egw_setup']->oProc->RefreshTable('egw_felamimail_accounts',array(
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $accounts[] = array
+ (
+ 'fm_id' =>
$GLOBALS['phpgw_setup']->oProc->f('fm_id'),
+ 'fm_ic_encryption' => (int)
!!$GLOBALS['phpgw_setup']->oProc->f('fm_ic_encryption'),
+ );
+ }
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_felamimail_accounts',array(),'fm_ic_encryption');
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_encryption',array(
+ 'type' => 'int',
+ 'precision' => '4',
+ 'nullable' => False
+ ));
+
+ foreach ($accounts as $account)
+ {
+ $sql = "UPDATE egw_felamimail_accounts SET
fm_ic_encryption = '{$account['fm_ic_encryption']}' WHERE fm_id =
'{$account['fm_id']}'";
+
$GLOBALS['phpgw_setup']->oProc->query($sql,__LINE__,__FILE__);
+ }
+/*
+
$GLOBALS['phpgw_setup']->oProc->RefreshTable('egw_felamimail_accounts',array(
'fd' => array(
'fm_owner' => array('type' =>
'int','precision' => '4','nullable' => False),
'fm_id' => array('type' => 'auto'),
@@ -413,15 +460,18 @@
'fm_ic_encryption' => "CASE WHEN
fm_ic_encryption THEN 1 ELSE 0 END",
)
);
-
- return $GLOBALS['setup_info']['felamimail']['currentver'] =
'1.3.004';
+*/
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ return
$GLOBALS['setup_info']['felamimail']['currentver'] = '1.3.004';
+ }
}
$test[] = '1.3.004';
function felamimail_upgrade1_3_004()
{
-
$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_signatures','fm_defaultsignature',array(
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_felamimail_signatures','fm_defaultsignature',array(
'type' => 'bool'
));
@@ -432,15 +482,15 @@
$test[] = '1.3.005';
function felamimail_upgrade1_3_005()
{
-
$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_enable_sieve',array(
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_enable_sieve',array(
'type' => 'bool',
'precision' => '255'
));
-
$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_sieve_server',array(
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_sieve_server',array(
'type' => 'varchar',
'precision' => '128'
));
-
$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_sieve_port',array(
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_ic_sieve_port',array(
'type' => 'int',
'precision' => '4'
));
@@ -458,10 +508,10 @@
$test[] = '1.4';
function felamimail_upgrade1_4()
{
- $GLOBALS['egw_setup']->oProc->DropTable('egw_felamimail_cache');
-
$GLOBALS['egw_setup']->oProc->DropTable('egw_felamimail_displayfilter');
-
$GLOBALS['egw_setup']->oProc->DropTable('egw_felamimail_folderstatus');
-
$GLOBALS['egw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_signatureid',array(
+
$GLOBALS['phpgw_setup']->oProc->DropTable('egw_felamimail_cache');
+
$GLOBALS['phpgw_setup']->oProc->DropTable('egw_felamimail_displayfilter');
+
$GLOBALS['phpgw_setup']->oProc->DropTable('egw_felamimail_folderstatus');
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_felamimail_accounts','fm_signatureid',array(
'type' => 'int',
'precision' => '4'
));
@@ -473,7 +523,7 @@
function felamimail_upgrade1_5_001()
{
-
$GLOBALS['egw_setup']->oProc->CreateTable('egw_felamimail_displayfilter',
+
$GLOBALS['phpgw_setup']->oProc->CreateTable('egw_felamimail_displayfilter',
Array(
'fd' => array(
'fmail_filter_accountid' => array('type' => 'int',
'precision' => 4, 'nullable' => false),
@@ -491,37 +541,35 @@
$test[] = '1.5.002';
function felamimail_upgrade1_5_002()
{
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_encryption',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_encryption',array(
'type' => 'int',
'precision' => '4',
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_hostname',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_hostname',array(
'type' => 'varchar',
'precision' => '128',
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_port',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_port',array(
'type' => 'int',
'precision' => '4',
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_username',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_username',array(
'type' => 'varchar',
'precision' => '128',
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_validatecertificate',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_ic_validatecertificate',array(
'type' => 'bool',
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_hostname',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_hostname',array(
'type' => 'varchar',
'precision' => '128',
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_port',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_port',array(
'type' => 'int',
'precision' => '4',
));
-
$GLOBALS['egw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_smtpauth',array(
+
$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_felamimail_accounts','fm_og_smtpauth',array(
'type' => 'bool',
));
return $GLOBALS['setup_info']['felamimail']['currentver'] =
'1.5.003';
}
-
-?>
Modified: branches/Version-1_0-branch/login.php
===================================================================
--- branches/Version-1_0-branch/login.php 2010-10-10 17:16:20 UTC (rev
6464)
+++ branches/Version-1_0-branch/login.php 2010-10-10 17:22:31 UTC (rev
6465)
@@ -110,7 +110,7 @@
}
if (
!isset($GLOBALS['phpgw_info']['server']['disable_autoload_langfiles']) ||
!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'] )
{
- $uilogin->check_langs();
+// $uilogin->check_langs();
}
$extra_vars['cd'] = 'yes';
@@ -209,7 +209,7 @@
}
if (
!isset($GLOBALS['phpgw_info']['server']['disable_autoload_langfiles']) ||
!$GLOBALS['phpgw_info']['server']['disable_autoload_langfiles'] )
{
- $uilogin->check_langs();
+// $uilogin->check_langs();
}
$extra_vars['cd'] = 'yes';
Modified: branches/Version-1_0-branch/notes/inc/class.uinotes.inc.php
===================================================================
--- branches/Version-1_0-branch/notes/inc/class.uinotes.inc.php 2010-10-10
17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/notes/inc/class.uinotes.inc.php 2010-10-10
17:22:31 UTC (rev 6465)
@@ -149,26 +149,17 @@
'order' => $this->order,
'extra' => $link_data
)),
- 'lang_content' => lang('content'),
- 'lang_time_created' => lang('time created'),
- 'lang_view' => lang('view'),
- 'lang_edit' => lang('edit'),
- 'lang_delete' => lang('delete'),
- 'lang_note_id' => lang('note id'),
'sort_note_id' =>
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
'var' => 'note_id',
'order' => $this->order,
'extra' => $link_data
-
)),
- 'lang_owner' => lang('owner')
+
))
);
$table_add = array
(
- 'lang_add' =>
lang('add'),
- 'lang_add_statustext' => lang('add a note'),
'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'notes.uinotes.edit'))
);
Modified: branches/Version-1_0-branch/notes/templates/base/app_data.xsl
===================================================================
--- branches/Version-1_0-branch/notes/templates/base/app_data.xsl
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/notes/templates/base/app_data.xsl
2010-10-10 17:22:31 UTC (rev 6465)
@@ -40,30 +40,30 @@
<xsl:apply-templates select="table_add" />
</xsl:template>
- <xsl:template match="table_header">
+ <xsl:template match="table_header" xmlns:php="http://php.net/xsl";>
<xsl:variable name="sort_time_created"
select="sort_time_created" />
<xsl:variable name="sort_note_id" select="sort_note_id" />
<tr class="th">
<td width="10%" align="right">
- <a href="{$sort_note_id}"
class="th_text"><xsl:value-of select="lang_note_id" /></a>
+ <a href="{$sort_note_id}"
class="th_text"><xsl:value-of select="php:function('lang', 'note id')" /></a>
</td>
<td width="40%">
- <xsl:value-of select="lang_content" />
+ <xsl:value-of
select="php:function('lang', 'content')" />
</td>
<td width="20%" align="center">
- <a href="{$sort_time_created}"
class="th_text"><xsl:value-of select="lang_time_created" /></a>
+ <a href="{$sort_time_created}"
class="th_text"><xsl:value-of select="php:function('lang', 'time created')"
/></a>
</td>
<td width="10%" align="center">
- <xsl:value-of select="lang_owner" />
+ <xsl:value-of
select="php:function('lang', 'owner')" />
</td>
<td width="5%" align="center">
- <xsl:value-of select="lang_view" />
+ <xsl:value-of
select="php:function('lang', 'view')" />
</td>
<td width="5%" align="center">
- <xsl:value-of select="lang_edit" />
+ <xsl:value-of
select="php:function('lang', 'edit')" />
</td>
<td width="5%" align="center">
- <xsl:value-of select="lang_delete" />
+ <xsl:value-of
select="php:function('lang', 'delete')" />
</td>
</tr>
</xsl:template>
@@ -108,9 +108,10 @@
</tr>
</xsl:template>
- <xsl:template match="table_add">
+ <xsl:template match="table_add" xmlns:php="http://php.net/xsl";>
<div>
- <a href="{add_action}"><xsl:value-of select="lang_add"
/></a>
+ <xsl:variable name="lang_add_statustext"><xsl:value-of
select="php:function('lang', 'add a note')" /></xsl:variable>
+ <a href="{add_action}"
title="{$lang_add_statustext}"><xsl:value-of select="php:function('lang',
'add')" /></a>
</div>
</xsl:template>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.db_pdo.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -845,18 +845,18 @@
switch ( $this->Type )
{
case 'mysql': // Not testet
- $this->query("SHOW FULL TABLES",__LINE__,
__FILE__);
+ $this->query("SHOW FULL
TABLES",__LINE__, __FILE__);
foreach($this->resultSet as $entry)
{
if($include_views)
{
- $return[] = $entry[0];
+ $return[] =
$entry["Tables_in_{$this->Database}"];
}
else
{
- if ($entry[1] =='BASE
TABLE')
+ if
($entry['Table_type'] =='BASE TABLE')
{
- $return[] =
$entry[0];
+ $return[] =
$entry["Tables_in_{$this->Database}"];
}
}
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.historylog.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.historylog.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.historylog.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -112,7 +112,7 @@
'record_id' =>
$this->db->f('history_record_id'),
'owner' =>
$GLOBALS['phpgw']->accounts->id2name($this->db->f('history_owner')),
// 'status' =>
lang($this->types[$this->db->f('history_status')]),
- 'status' => ereg_replace('
','',$this->db->f('history_status')),
+ 'status' => str_replace('
','',$this->db->f('history_status')),
'new_value' =>
htmlspecialchars_decode($this->db->f('history_new_value',true)),
'old_value' =>
htmlspecialchars_decode($this->db->f('history_old_value',true)),
'datetime' =>
$this->db->from_timestamp($this->db->f('history_timestamp'))
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.interserver.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.interserver.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.interserver.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -131,8 +131,8 @@
{
preg_match('/^(.*?\/\/.*?)(\/.*)/',$url,$matches);
$hostpart = $matches[1];
- $hostpart = ereg_replace('https://','',$hostpart);
- $hostpart = ereg_replace('http://','',$hostpart);
+ $hostpart = str_replace('https://','',$hostpart);
+ $hostpart = str_replace('http://','',$hostpart);
switch($this->mode)
{
case 'soap':
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.log.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.log.inc.php 2010-10-10
17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.log.inc.php 2010-10-10
17:22:31 UTC (rev 6465)
@@ -274,7 +274,7 @@
{
$trace = '<h2>' .lang('back
trace') . "</h2>\n"
. '<p>'
. lang('Please include the following output when you report this incident on
our bug tracker - %1',
-
'<a href="https://savannah.gnu.org/bugs/?group=phpgroupware";
target="_blank">https://savannah.gnu.org/bugs/?group=phpgroupware</a>') .
"</p>\n"
+
'<a href="https://savannah.nongnu.org/bugs/?group=fmsystem";
target="_blank">https://savannah.nongnu.org/bugs/?group=fmsystem</a>') .
"</p>\n"
.
'<pre>' . implode("\n", $msg_array) . '</pre>';
}
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.menu.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.menu.inc.php 2010-10-10
17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.menu.inc.php 2010-10-10
17:22:31 UTC (rev 6465)
@@ -238,4 +238,150 @@
HTML;
return $out;
}
+
+
+ /**
+ * Render a horisontal menu for an application
+ *
+ * @param array $menu the menu item
+ */
+ public static function render_horisontal_menu($menu)
+ {
+ $html = <<<HTML
+ <table id="menu">
+ <tr>
+ <td>
+ <table>
+ <tr>
+HTML;
+ foreach ($menu as &$item)
+ {
+ $current_class = '';
+ if ( $item['this'] )
+ {
+ $current_class = 'current';
+ $item['text'] =
"[<b>{$item['text']}</b>]";
+ }
+ $link_class =" class=\"{$current_class}\"";
+ $html .= <<<HTML
+ <td>
+ <a
href="{$item['url']}"{$link_class} id="{$id}">
+
<span>{$item['text']}</span>
+ </a>
+ </td>
+HTML;
+
+ if ( $item['children'] )
+ {
+ $children = $item['children'];
+ }
+ }
+ $html .= <<<HTML
+ </tr>
+ </table>
+HTML;
+
+ $html .= isset($children) ?
self::_render_horisontal_submenu($children) : '';
+
+ $html .= <<<HTML
+ </tr>
+ </table>
+HTML;
+ return $html;
+ }
+
+ /**
+ * Get sub items from a menu
+ *
+ * @param array $menu the menu items to add to structure
+ */
+ protected static function _render_horisontal_submenu($menu)
+ {
+ $html = <<<HTML
+ <tr>
+ <td>
+ <table>
+ <tr>
+HTML;
+
+ foreach ($menu as &$item)
+ {
+ $current_class = '';
+ if ( $item['this'] )
+ {
+ $current_class = 'current';
+ $item['text'] =
"[<b>{$item['text']}</b>]";
+ }
+ $link_class =" class=\"{$current_class}\"";
+ $html .= <<<HTML
+ <td>
+ <a
href="{$item['url']}"{$link_class} id="{$id}">
+
<span>{$item['text']}</span>
+ </a>
+ </td>
+HTML;
+
+ if ( $item['children'] )
+ {
+ $children = $item['children'];
+ }
+ }
+ $html .= <<<HTML
+ </tr>
+ </table>
+HTML;
+
+ $html .= isset($children) ?
self::_render_horisontal_submenu($children) : '';
+ $html .= <<<HTML
+ </td>
+ </tr>
+HTML;
+ return $html;
+ }
+
+
+ public function get_local_menu($app = '')
+ {
+ $app = $app ? $app :
$GLOBALS['phpgw_info']['flags']['currentapp'];
+ if(!$menu =
$GLOBALS['phpgw']->session->appsession($GLOBALS['phpgw_info']['flags']['menu_selection'],
"menu_{$app}"))
+ {
+ $menu_gross =
execMethod("{$app}.menu.get_menu",'horisontal');
+ $selection =
explode('::',$GLOBALS['phpgw_info']['flags']['menu_selection']);
+ $level=0;
+ $menu =
self::_get_sub_menu($menu_gross['navigation'],$selection,$level);
+
$GLOBALS['phpgw']->session->appsession(isset($GLOBALS['phpgw_info']['flags']['menu_selection'])
&& $GLOBALS['phpgw_info']['flags']['menu_selection'] ?
$GLOBALS['phpgw_info']['flags']['menu_selection'] : 'menu_missing_selection',
"menu_{$app}", $menu);
+ unset($menu_gross);
+ }
+ return $menu;
+ }
+
+ protected static function _get_sub_menu($children = array(),
$selection=array(),$level=0)
+ {
+ $level++;
+ $i=0;
+ $menu = array();
+ foreach($children as $key => $vals)
+ {
+ $menu[] = $vals;
+ $menu[$i]['this'] = false;
+ if($key == $selection[$level])
+ {
+ $menu[$i]['this'] = true;
+ if(isset($menu[$i]['children']))
+ {
+ $menu[$i]['children'] =
self::_get_sub_menu($menu[$i]['children'],$selection,$level);
+ }
+ }
+ else
+ {
+ if(isset($menu[$i]['children']))
+ {
+ unset($menu[$i]['children']);
+ }
+ }
+ $i++;
+ }
+
+ return $menu;
+ }
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.ping.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.ping.inc.php 2010-10-10
17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.ping.inc.php 2010-10-10
17:22:31 UTC (rev 6465)
@@ -62,13 +62,13 @@
$dl =
$this->raw_array_of_data[count($this->raw_array_of_data) - 3];
$values = explode(',',$dl);
- $packet_tx = ereg_replace(' packets
transmitted','',$values[0]);
- $packet_rx = ereg_replace(' packets
received','',$values[1]);
- $packet_loss = ereg_replace('% packet
loss','',$values[2]);
+ $packet_tx = str_replace(' packets
transmitted','',$values[0]);
+ $packet_rx = str_replace(' packets
received','',$values[1]);
+ $packet_loss = str_replace('% packet
loss','',$values[2]);
- $this->packet_tx = (int)ereg_replace('
','',$packet_tx);
- $this->packet_rx = (int)ereg_replace('
','',$packet_rx);
- $this->packet_loss = (int)ereg_replace('
','',$packet_loss);
+ $this->packet_tx = (int)str_replace('
','',$packet_tx);
+ $this->packet_rx = (int)str_replace('
','',$packet_rx);
+ $this->packet_loss = (int)str_replace('
','',$packet_loss);
}
function parse_times()
@@ -76,7 +76,7 @@
$tl =
$this->raw_array_of_data[count($this->raw_array_of_data) - 2];
$times_split = explode(' = ',$tl);
$raw_times = $times_split[1];
- $raw_times = ereg_replace(' ms','',$raw_times);
+ $raw_times = str_replace(' ms','',$raw_times);
$values = explode('/',$raw_times);
$this->response_min = $values[0];
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_mysql.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -287,7 +287,7 @@
/* The rest of this is used only for SQL->array
*/
$colinfo = explode('(',$oProc->m_odb->f(1));
- $prec = ereg_replace(')','',$colinfo[1]);
+ $prec = str_replace(')','',$colinfo[1]);
$scales = explode(',',$prec);
if($colinfo[0] == 'enum')
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_oracle.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_oracle.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_oracle.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -220,7 +220,7 @@
/* The rest of this is used only for SQL->array
*/
$colinfo = explode('(',$oProc->m_odb->f(1));
- $prec = ereg_replace(')','',$colinfo[1]);
+ $prec = str_replace(')','',$colinfo[1]);
$scales = explode(',',$prec);
if($colinfo[0] == 'enum')
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.schema_proc_pgsql.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -358,7 +358,7 @@
$default = '';
$nullcomma = '';
}
- $default = ereg_replace("''","'",$default);
+ $default = str_replace("''","'",$default);
$this->sCol[] = "\t\t\t\t'" . $colname . "' =>
array(" . $type . ',' . $null . $nullcomma . $default . '),' . "\n";
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php 2010-10-10
17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.send.inc.php 2010-10-10
17:22:31 UTC (rev 6465)
@@ -382,8 +382,8 @@
{
// convert HTML chars for ' and " in the email sig
to normal text
$sig_clean = $sig;
- $sig_clean = ereg_replace('"', '"', $sig_clean);
- $sig_clean = ereg_replace(''', '\'', $sig_clean);
+ $sig_clean = str_replace('"', '"', $sig_clean);
+ $sig_clean = str_replace(''', '\'', $sig_clean);
return $sig_clean;
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.setup.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -538,7 +538,7 @@
// Clean up locations, custom fields and ACL
$this->db->query("SELECT app_id FROM phpgw_applications
WHERE app_name = '{$appname}'");
$this->db->next_record();
- $app_id = $this->db->f('app_id');
+ $app_id = (int)$this->db->f('app_id');
$this->db->query("SELECT location_id FROM
phpgw_locations WHERE app_id = {$app_id}");
@@ -651,8 +651,8 @@
echo'<br>Input values: '
. 'A="'.$a.'", B="'.$b.'"';
}
- $newa = ereg_replace('pre','.',$a);
- $newb = ereg_replace('pre','.',$b);
+ $newa = str_replace('pre','.',$a);
+ $newb = str_replace('pre','.',$b);
$testa = explode('.',$newa);
if(@$testa[1] == '')
{
@@ -740,8 +740,8 @@
echo'<br>Input values: '
. 'A="'.$a.'", B="'.$b.'"';
}
- $newa = ereg_replace('pre','.',$a);
- $newb = ereg_replace('pre','.',$b);
+ $newa = str_replace('pre','.',$a);
+ $newb = str_replace('pre','.',$b);
$testa = explode('.',$newa);
if( !isset($testa[3]) || $testa[3] == '')
{
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.setup_process.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.setup_process.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.setup_process.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -445,6 +445,57 @@
}
/**
+ * process application add credential to admins at install
+ *
+ * @param $setup_info array of application info from
setup.inc.php files, etc.
+ */
+ function add_credential($appname)
+ {
+ $GLOBALS['phpgw']->accounts =
createObject('phpgwapi.accounts');
+ $GLOBALS['phpgw']->acl =
CreateObject('phpgwapi.acl');
+
+ $admins = array();
+ $accounts =
$GLOBALS['phpgw']->acl->get_ids_for_location('run', phpgwapi_acl::READ,
'admin');
+ foreach($accounts as $account_id)
+ {
+ $account =
$GLOBALS['phpgw']->accounts->get($account_id);
+ if($account->type ==
phpgwapi_account::TYPE_GROUP)
+ {
+ $admins[] = $account_id;
+ }
+ }
+
+ $members = array();
+ foreach ($admins as $admin)
+ {
+ if(!$GLOBALS['phpgw']->acl->check('run',
phpgwapi_acl::READ, $appname))
+ {
+ $locations =
$GLOBALS['phpgw']->locations->get_locations(false, $appname);
+
+ $aclobj =& $GLOBALS['phpgw']->acl;
+ $aclobj->set_account_id($admin, true);
+ // application permissions
+ $aclobj->add($appname, 'run',
phpgwapi_acl::READ);
+ foreach ($locations as $location =>
$info)
+ {
+ $aclobj->add($appname,
$location, 31);
+ }
+
+ $aclobj->save_repository();
+ $members = array_merge($members,
$GLOBALS['phpgw']->accounts->get_members($admin));
+ }
+ }
+
+ $members = array_unique($members);
+ //Clear the user's menu so it can be regenerated cleanly
+ //FIXME - the cache is not cleared
+ foreach ($members as $account_id)
+ {
+ phpgwapi_cache::user_clear('phpgwapi', 'menu',
$account_id);
+ }
+ }
+
+ /**
* process test_data.inc.php in each application/setup dir for
developer tests
*
* This data should work with the baseline tables
@@ -624,7 +675,7 @@
$currentver =
isset($setup_info[$key]['currentver']) ? $setup_info[$key]['currentver'] : '';
/* build
upgrade function name */
- $function =
$appname . '_upgrade' . ereg_replace("\.", '_', $value);
+ $function =
$appname . '_upgrade' . str_replace('.', '_', $value);
if($DEBUG)
{
Modified:
branches/Version-1_0-branch/phpgwapi/inc/class.setup_translation.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.setup_translation.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.setup_translation.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -64,7 +64,7 @@
* @param $key phrase to translate
* @param $vars vars sent to lang function, passed to us
*/
- public function translate($key, $vars = array(), $only_common =
false )
+ public function translate($key, $vars = array(), $only_common =
false , $force_app = '')
{
if ( !is_array($vars) )
{
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.shm.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.shm.inc.php 2010-10-10
17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.shm.inc.php 2010-10-10
17:22:31 UTC (rev 6465)
@@ -76,7 +76,7 @@
}
else
{
- $GLOBALS['phpgw_info']['server']['temp_dir'] = '/tmp/';
+ $GLOBALS['phpgw_info']['server']['temp_dir'] = '/tmp';
}
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.uijsaddressbook.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.uijsaddressbook.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.uijsaddressbook.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -636,7 +636,7 @@
//We get it from the category class and ...
$this->categoryobject=CreateObject('phpgwapi.categories');
$this->categoryobject->app_name = 'addressbook';
- $this->catlist=ereg_replace( ' <' .
lang('Global') . ' ' . lang($this->categoryobject->app_name).'>'
+ $this->catlist=str_replace( ' <' .
lang('Global') . ' ' . lang($this->categoryobject->app_name).'>'
,'',$this->categoryobject->formated_list('select','all',$this->cat_id,'True'));
// }
$this->template->set_var('cats_list',
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.validator.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.validator.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.validator.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -294,7 +294,7 @@
echo 'definition</a> , therefore it has been removed.
<br><br>';
echo 'If you are a application maintainer, please
update your app. ';
echo 'If you are a user, please file a bug report on ';
- echo '<a
href="https://savannah.gnu.org/bugs/?group=phpgroupware";>';
+ echo '<a
href="https://savannah.nongnu.org/bugs/?group=fmsystem";>';
echo 'our project page at savannah.gnu.org</a>. Please
copy and paste ';
echo 'the following information into the bug
report:<br>';
echo '<b>Summary<b>: ' .
$GLOBALS['phpgw_info']['flags']['currentapp'];
@@ -305,4 +305,4 @@
exit;
}
}
-?>
\ No newline at end of file
+?>
Modified: branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/class.vcard.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -181,10 +181,10 @@
$field[$key] = strtoupper($val);
}
- $field[0] = ereg_replace("A\.",'',$field[0]);
- $field[0] = ereg_replace("B\.",'',$field[0]);
- $field[0] = ereg_replace("C\.",'',$field[0]);
- $field[0] = ereg_replace("D\.",'',$field[0]);
+ $field[0] = str_replace("A\.",'',$field[0]);
+ $field[0] = str_replace("B\.",'',$field[0]);
+ $field[0] = str_replace("C\.",'',$field[0]);
+ $field[0] = str_replace("D\.",'',$field[0]);
$values = split(';',$value);
switch ($field[0])
{
@@ -247,15 +247,15 @@
$entry['comm_media']['website'] =
$values[0];
break;
case 'NOTE':
- //$entry['note'] =
ereg_replace('=0D=0A',"\n",$values[0]);
+ //$entry['note'] =
str_replace('=0D=0A',"\n",$values[0]);
$entry['notes']['type'] = 'vcard';
- $entry['notes']['note'] =
ereg_replace('=0D=0A',"\n",$values[0]);
+ $entry['notes']['note'] =
str_replace('=0D=0A',"\n",$values[0]);
break;
case 'KEY':
- $entry['key'] =
ereg_replace('=0D=0A',"\n",$values[0]);
+ $entry['key'] =
str_replace('=0D=0A',"\n",$values[0]);
break;
case 'LABEL':
- $entry['label'] =
ereg_replace('=0D=0A',"\n",$values[0]);
+ $entry['label'] =
str_replace('=0D=0A',"\n",$values[0]);
break;
case 'BDAY': #1969-12-31
// use ISO 8601
@@ -276,7 +276,7 @@
$entry['department'] = $values[1];
break;
case 'ADR':
- $field[1] =
ereg_replace("TYPE=",'',$field[1]);
+ $field[1] =
str_replace("TYPE=",'',$field[1]);
switch ($field[1])
{
case 'INTL':
@@ -689,7 +689,7 @@
$entries .= 'ORG;ENCODING=QUOTED-PRINTABLE:' .
$org . "\r\n";
}
- $workattr = ereg_replace('ADR;','',$workattr);
+ $workattr = str_replace('ADR;','',$workattr);
// remember the correct order of address fields!
$workaddr['POSTOFFICEBOX'] =
$this->vCard_encode($workaddr['POSTOFFICEBOX'], 'QUOTED-PRINTABLE', false);
$workaddr['EXT'] =
$this->vCard_encode($workaddr['EXT'], 'QUOTED-PRINTABLE', false);
@@ -702,7 +702,7 @@
$work = 'A.ADR;' . $workattr .
';ENCODING=QUOTED-PRINTABLE:' . $workaddr . "\r\n";
$wlabel = 'LABEL;TYPE=WORK;;ENCODING=QUOTED-PRINTABLE:'
. $wlabel . "\r\n";
- $homeattr = ereg_replace('ADR;','',$homeattr);
+ $homeattr = str_replace('ADR;','',$homeattr);
// remember the correct order of address fields!
$homeaddr['POSTOFFICEBOX'] =
$this->vCard_encode($homeaddr['POSTOFFICEBOX'], 'QUOTED-PRINTABLE', false);
$homeaddr['EXT'] =
$this->vCard_encode($homeaddr['EXT'], 'QUOTED-PRINTABLE', false);
@@ -715,7 +715,7 @@
$home = 'B.ADR;' . $homeattr .
';ENCODING=QUOTED-PRINTABLE:' . $homeaddr . "\r\n";
$hlabel = 'LABEL;TYPE=HOME;;ENCODING=QUOTED-PRINTABLE:'
. $hlabel . "\r\n";
- $entries = ereg_replace('PUBKEY','KEY',$entries);
+ $entries = str_replace('PUBKEY','KEY',$entries);
$entries .= $work . $home . $wlabel . $hlabel .
'END:VCARD' . "\r\n";
$entries .= "\r\n";
@@ -822,7 +822,7 @@
if ( strstr(strtolower($name),
$this->import[$fname]) )
{
$value = trim($value);
- //$value =
ereg_replace('=0D=0A','\n',$value); // use quoted_printable_decode above
+ //$value =
str_replace('=0D=0A','\n',$value); // use quoted_printable_decode above
$parsed_line += array($name =>
$value);
}
}
Modified: branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2010-10-10
17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/functions.inc.php 2010-10-10
17:22:31 UTC (rev 6465)
@@ -454,7 +454,7 @@
{
if(!$GLOBALS['phpgw']->db->query('select count(config_name)
from phpgw_config',__LINE__,__FILE__))
{
- $setup_dir =
ereg_replace($_SERVER['PHP_SELF'],'index.php','setup/');
+ $setup_dir =
str_replace($_SERVER['PHP_SELF'],'index.php','setup/');
echo '<center><b>Fatal Error:</b> It appears that you
have not created the database tables for '
.'phpGroupWare. Click <a href="' . $setup_dir .
'">here</a> to run setup.</center>';
exit;
@@ -462,7 +462,7 @@
}
else
{
- $setup_dir =
ereg_replace($_SERVER['PHP_SELF'],'index.php','setup/');
+ $setup_dir =
str_replace($_SERVER['PHP_SELF'],'index.php','setup/');
echo '<center><b>Fatal Error:</b> Unable to connect to database
server '
.'Click <a href="' . $setup_dir . '">here</a> to run
setup.</center>';
exit;
Modified: branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/inc/sso/include_login.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -222,6 +222,8 @@
$this->tmpl->set_file(array('login_form' =>
'login.tpl'));
$this->tmpl->set_var('charset', lang('charset'));
+
+ $this->tmpl->set_block('login_form', 'message_block',
'message_blocks');
$this->tmpl->set_block('login_form', 'domain_option',
'domain_options');
$this->tmpl->set_block('login_form', 'domain_select',
'domain_selects');
$this->tmpl->set_block('login_form',
'login_additional_info', 'login_additional_infos');
@@ -465,6 +467,22 @@
}
$this->tmpl->set_var('autocomplete', $autocomplete);
unset($autocomplete);
+
+ if($cd)
+ {
+ if($cd == 1)
+ {
+ $this->tmpl->set_var('message_class',
'message');
+
$this->tmpl->set_var('message_class_item', 'message message fade');
+ }
+ else
+ {
+ $this->tmpl->set_var('message_class',
'error');
+
$this->tmpl->set_var('message_class_item', 'error message fade');
+ }
+ $this->tmpl->parse('message_blocks',
'message_block');
+ }
+
if(!$this->msg_only)
{
$this->tmpl->parse('loging_blocks',
'loging_block');
Modified: branches/Version-1_0-branch/phpgwapi/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/default_records.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/setup/default_records.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -172,7 +172,16 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
phpgw_contact_note_type (description) VALUES ('system')");
$GLOBALS['phpgw_setup']->oProc->query("SELECT comm_type_id FROM
phpgw_contact_comm_type WHERE type='email'");
- $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+// $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+ $comm_type_ids = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $comm_type_ids[]=array
+ (
+ 'comm_type_id' =>
$GLOBALS['phpgw_setup']->oProc->f('comm_type_id')
+ );
+ }
+
for($i = 0; $i < count($comm_type_ids); $i++)
{
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
phpgw_contact_comm_descr (comm_type_id,descr) VALUES ("
@@ -187,7 +196,16 @@
}
$GLOBALS['phpgw_setup']->oProc->query("SELECT comm_type_id FROM
phpgw_contact_comm_type WHERE type='phone'");
- $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+// $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+ $comm_type_ids = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $comm_type_ids[]=array
+ (
+ 'comm_type_id' =>
$GLOBALS['phpgw_setup']->oProc->f('comm_type_id')
+ );
+ }
+
for($i = 0; $i < count($comm_type_ids); $i++)
{
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
phpgw_contact_comm_descr (comm_type_id,descr) VALUES ("
@@ -228,7 +246,16 @@
. ")");
}
$GLOBALS['phpgw_setup']->oProc->query("SELECT comm_type_id FROM
phpgw_contact_comm_type WHERE type='fax'");
- $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+// $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+ $comm_type_ids = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $comm_type_ids[]=array
+ (
+ 'comm_type_id' =>
$GLOBALS['phpgw_setup']->oProc->f('comm_type_id')
+ );
+ }
+
for($i = 0; $i < count($comm_type_ids); $i++)
{
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
phpgw_contact_comm_descr (comm_type_id,descr) VALUES ("
@@ -241,7 +268,16 @@
. ")");
}
$GLOBALS['phpgw_setup']->oProc->query("SELECT comm_type_id FROM
phpgw_contact_comm_type WHERE type='mobile phone'");
- $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+// $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+ $comm_type_ids = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $comm_type_ids[]=array
+ (
+ 'comm_type_id' =>
$GLOBALS['phpgw_setup']->oProc->f('comm_type_id')
+ );
+ }
+
for($i = 0; $i < count($comm_type_ids); $i++)
{
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
phpgw_contact_comm_descr (comm_type_id,descr) VALUES ("
@@ -254,7 +290,16 @@
. ")");
}
$GLOBALS['phpgw_setup']->oProc->query("SELECT comm_type_id FROM
phpgw_contact_comm_type WHERE type='instant messaging'");
- $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+// $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+ $comm_type_ids = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $comm_type_ids[]=array
+ (
+ 'comm_type_id' =>
$GLOBALS['phpgw_setup']->oProc->f('comm_type_id')
+ );
+ }
+
for($i = 0; $i < count($comm_type_ids); $i++)
{
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
phpgw_contact_comm_descr (comm_type_id,descr) VALUES ("
@@ -279,7 +324,16 @@
. ")");
}
$GLOBALS['phpgw_setup']->oProc->query("SELECT comm_type_id FROM
phpgw_contact_comm_type WHERE type='url'");
- $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+// $comm_type_ids = $GLOBALS['phpgw_setup']->oProc->m_odb->resultSet;
+ $comm_type_ids = array();
+ while ($GLOBALS['phpgw_setup']->oProc->next_record())
+ {
+ $comm_type_ids[]=array
+ (
+ 'comm_type_id' =>
$GLOBALS['phpgw_setup']->oProc->f('comm_type_id')
+ );
+ }
+
for($i = 0; $i < count($comm_type_ids); $i++)
{
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
phpgw_contact_comm_descr (comm_type_id,descr) VALUES ("
Modified: branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/setup/tables_current.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -86,7 +86,7 @@
'pk' => array('delegate_id'),
'fk' => array(),
'ix' => array(),
- 'uc' =>
array('account_id','owner_id','location_id','data')
+ 'uc' =>
array()//array('account_id','owner_id','location_id','data') //FIXME - MySQL
needs a length on the data-field
),
'phpgw_preferences' => array(
'fd' => array(
@@ -691,6 +691,6 @@
'pk' => array('section_id','attrib_id','id'),
'fk' => array(),
'ix' => array(),
- 'uc' => array('section_id','attrib_id','value')
+ 'uc' => array()
)
);
Modified: branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/setup/tables_update.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -1335,13 +1335,15 @@
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_acl','acl_grantor',array(
'type' => 'int',
'precision' => '4',
- 'nullable' => True
+ 'nullable' => True,
+ 'default' => -1,
));
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_acl','acl_type',array(
'type' => 'int',
'precision' => '2',
- 'nullable' => True
+ 'nullable' => True,
+ 'default' => '0',
));
$GLOBALS['phpgw_setup']->oProc->CreateTable(
@@ -2743,7 +2745,7 @@
'pk' => array('delegate_id'),
'fk' => array(),
'ix' => array(),
- 'uc' =>
array('account_id','owner_id','location_id','data')
+ 'uc' =>
array()//array('account_id','owner_id','location_id','data') //FIXME - MySQL
needs a length on the data-field
)
);
@@ -2830,7 +2832,7 @@
'pk' => array('section_id','attrib_id','id'),
'fk' => array(),
'ix' => array(),
- 'uc' => array('section_id','attrib_id','value')
+ 'uc' => array()
)
);
Copied: branches/Version-1_0-branch/phpgwapi/templates/base/css/ie6.css (from
rev 6464, trunk/phpgwapi/templates/base/css/ie6.css)
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/css/ie6.css
(rev 0)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/css/ie6.css
2010-10-10 17:22:31 UTC (rev 6465)
@@ -0,0 +1,16 @@
+/* CSS Document */
+
+div#toolbar-box {
+ float: left;
+ width: 100%;
+}
+
+#minwidth, #minwidth-body {width:expression(document.body.clientWidth <= 960?
"960px": "auto"); }
+
+#content-box {
+ float: left;
+}
+
+input { border-width:
expression(this.type=="radio"?'0px':this.type=="checkbox"?'0px':'1px'); }
+
+
Copied: branches/Version-1_0-branch/phpgwapi/templates/base/css/ie7.css (from
rev 6464, trunk/phpgwapi/templates/base/css/ie7.css)
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/css/ie7.css
(rev 0)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/css/ie7.css
2010-10-10 17:22:31 UTC (rev 6465)
@@ -0,0 +1,19 @@
+input { border-width:
expression(this.type=="radio"?'0px':this.type=="checkbox"?'0px':'1px'); }
+
+div#toolbar-box {
+ height: 65px;
+}
+
+#toolbar-box div.m {
+height: 50px;
+
+}
+
+.button2-left .page a, .button2-right .page a, .button2-left .page span,
.button2-right .page span, .button2-left .blank a, .button2-right .blank a,
.button2-left .blank span, .button2-right .blank span{
+ float: left;
+}
+
+ #sbox-window {
+margin:30%;
+}
+
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/css/joomla_general.css
(from rev 6464, trunk/phpgwapi/templates/base/css/joomla_general.css)
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/css/joomla_general.css
(rev 0)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/css/joomla_general.css
2010-10-10 17:22:31 UTC (rev 6465)
@@ -0,0 +1,596 @@
+/**
+* @version $Id: general.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights
reserved.
+* @license GNU/GPL, see LICENSE.php
+* Joomla! is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+* See COPYRIGHT.php for copyright notices and details.
+*/
+
+/**
+ * Joomla! 1.5 Admin template main css file
+ *
+ * @author Andy Miller <address@hidden>
+ * @package Joomla
+ * @since 1.5
+ * @version 1.0
+ */
+
+/* -- General styles ------------------------------ */
+
+body {
+ margin: 10px; padding: 0;
+ background: #fff;
+ padding-bottom: 1px;
+
+ font-size: 11px;
+}
+
+body, td, th { font-family: Arial, Helvetica, sans-serif; }
+
+html, body { height: 95%; }
+
+#minwidth { min-width: 960px; }
+
+.clr { clear: both; overflow:hidden; height: 0; }
+
+a, img { padding: 0; margin: 0; }
+
+img { border: 0 none; }
+
+form { margin: 0; padding: 0; }
+
+h1 {
+ margin: 0; padding-bottom: 8px;
+ color: #0B55C4; font-size: 20px; font-weight: bold;
+}
+
+h3 {
+ font-size: 13px;
+}
+
+a:link { color: #0B55C4; text-decoration: none; }
+a:visited { color: #0B55C4; text-decoration: none; }
+a:hover { text-decoration: underline; }
+
+fieldset {
+ margin-bottom: 10px;
+ border: 1px #ccc solid;
+ padding: 5px;
+ text-align: left;
+}
+
+fieldset p { margin: 10px 0px; }
+
+legend {
+ color: #0B55C4;
+ font-size: 12px;
+ font-weight: bold;
+}
+
+input, select { font-size: 10px; border: 1px solid silver; }
+textarea { font-size: 11px; border: 1px solid silver; }
+button { font-size: 10px; }
+
+input.disabled { background-color: #F0F0F0; }
+
+input.button { cursor: pointer; }
+
+input:focus,
+select:focus,
+textarea:focus { background-color: #ffd }
+
+/* -- overall styles ------------------------------ */
+
+#border-top.h_green { background: url(../images/j_header_middle.png)
repeat-x; }
+#border-top.h_green div { background: url(../images/j_header_right.png)
100% 0 no-repeat; }
+#border-top.h_green div div { background: url(../images/j_header_left.png)
no-repeat; height: 54px; }
+
+#border-top.h_teal { background: url(../images/j_header_middle.png)
repeat-x; }
+#border-top.h_teal div { background: url(../images/j_header_right.png)
100% 0 no-repeat; }
+#border-top.h_teal div div { background: url(../images/j_header_left.png)
no-repeat; height: 54px; }
+
+#border-top.h_cherry { background: url(../images/j_header_middle.png)
repeat-x; }
+#border-top.h_cherry div { background: url(../images/j_header_right.png)
100% 0 no-repeat; }
+#border-top.h_cherry div div { background: url(../images/j_header_left.png)
no-repeat; height: 54px; }
+
+#border-top .title {
+ font-size: 22px; font-weight: bold; color: #fff; line-height: 44px;
+ padding-left: 180px;
+}
+
+#border-top .version {
+ display: block; float: right;
+ color: #fff;
+ padding: 25px 5px 0 0;
+}
+
+#border-bottom { background:
url(../images/j_bottom.png) repeat-x; }
+#border-bottom div { background: url(../images/j_corner_br.png)
100% 0 no-repeat; }
+#border-bottom div div { background: url(../images/j_corner_bl.png)
no-repeat; height: 11px; }
+
+#footer .copyright { margin: 10px; text-align: center; }
+
+#header-box { border: 1px solid #ccc; background: #f0f0f0; }
+
+#content-box {
+ border-left: 1px solid #ccc;
+ border-right: 1px solid #ccc;
+}
+
+#content-box .padding { padding: 10px 10px 0 10px; }
+
+#toolbar-box { background: #fbfbfb; margin-bottom: 10px; }
+
+#submenu-box { background: #f6f6f6; margin-bottom: 10px; }
+#submenu-box .padding { padding: 0px;}
+
+
+/* -- status layout */
+#module-status { float: right; }
+#module-status span { display: block; float: left; line-height: 16px; padding:
4px 10px 0 22px; margin-bottom: 5px; }
+
+#module-status { background: url(../images/mini_icon.png) 3px 5px no-repeat; }
+.legacy-mode{ color: #c00;}
+#module-status .preview { background:
url(../images/menu/icon-16-media.png) 3px 3px no-repeat; }
+#module-status .unread-messages,
+#module-status .no-unread-messages { background:
url(../images/menu/icon-16-messages.png) 3px 3px no-repeat; }
+#module-status .unread-messages a { font-weight: bold; }
+#module-status .loggedin-users { background:
url(../images/menu/icon-16-user.png) 3px 3px no-repeat; }
+#module-status .logout { background:
url(../images/menu/icon-16-logout.png) 3px 3px no-repeat; }
+
+/* -- various styles -- */
+span.note {
+ display: block;
+ background: #ffd;
+ padding: 5px;
+ color: #666;
+}
+
+/** overlib **/
+
+.ol-foreground {
+ background-color: #ffe;
+}
+
+.ol-background {
+ background-color: #6db03c;
+}
+
+.ol-textfont {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ color: #666;
+}
+
+.ol-captionfont {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #fff;
+ font-weight: bold;
+}
+.ol-captionfont a {
+ color: #0b5fc6;
+ text-decoration: none;
+}
+
+.ol-closefont {}
+
+/** toolbar **/
+
+div.header {
+ font-size: 22px; font-weight: bold; color: #0B55C4; line-height: 48px;
+ padding-left: 55px;
+ background-repeat: no-repeat;
+ margin-left: 10px;
+}
+
+div.header span { color: #666; }
+
+div.configuration {
+ font-size: 14px; font-weight: bold; color: #0B55C4; line-height: 16px;
+ padding-left: 30px;
+ margin-left: 10px;
+ background-image: url(../images/menu/icon-16-config.png);
+ background-repeat: no-repeat;
+}
+
+div.toolbar { float: right; text-align: right; padding: 0; }
+
+table.toolbar { border-collapse: collapse; padding:
0; margin: 0; }
+table.toolbar td { padding: 1px 1px 1px 4px;
text-align: center; color: #666; height: 48px; }
+table.toolbar td.spacer { width: 10px; }
+table.toolbar td.divider { border-right: 1px solid #eee; width: 5px; }
+
+table.toolbar span { float: none; width: 32px; height: 32px; margin: 0 auto;
display: block; }
+
+table.toolbar a {
+ display: block; float: left;
+ white-space: nowrap;
+ border: 1px solid #fbfbfb;
+ padding: 1px 5px;
+ cursor: pointer;
+}
+
+table.toolbar a:hover {
+ border-left: 1px solid #eee;
+ border-top: 1px solid #eee;
+ border-right: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+ text-decoration: none;
+ color: #0B55C4;
+}
+
+/** for massmail component **/
+td#mm_pane { width: 90%; }
+input#mm_subject { width: 200px; }
+textarea#mm_message { width: 100%; }
+
+/* pane-sliders */
+.pane-sliders .title {
+ margin: 0;
+ padding: 2px;
+ color: #666;
+ cursor: pointer;
+}
+
+.pane-sliders .panel { border: 1px solid #ccc; margin-bottom: 3px;}
+
+.pane-sliders .panel h3 { background: #f6f6f6; color: #666}
+
+.pane-sliders .content { background: #f6f6f6; }
+
+.pane-sliders .adminlist { border: 0 none; }
+.pane-sliders .adminlist td { border: 0 none; }
+
+.jpane-toggler span { background: transparent url(../images/j_arrow.png)
5px 50% no-repeat; padding-left: 20px;}
+.jpane-toggler-down span { background: transparent
url(../images/j_arrow_down.png) 5px 50% no-repeat; padding-left: 20px;}
+
+.jpane-toggler-down { border-bottom: 1px solid #ccc; }
+
+/* tabs */
+
+dl.tabs {
+ float: left;
+ margin: 10px 0 -1px 0;
+ z-index: 50;
+}
+
+dl.tabs dt {
+ float: left;
+ padding: 4px 10px;
+ border-left: 1px solid #ccc;
+ border-right: 1px solid #ccc;
+ border-top: 1px solid #ccc;
+ margin-left: 3px;
+ background: #f0f0f0;
+ color: #666;
+}
+
+dl.tabs dt.open {
+ background: #F9F9F9;
+ border-bottom: 1px solid #F9F9F9;
+ z-index: 100;
+ color: #000;
+}
+
+div.current {
+ clear: both;
+ border: 1px solid #ccc;
+ padding: 10px 10px;
+}
+
+div.current dd {
+ padding: 0;
+ margin: 0;
+}
+/** cpanel settings **/
+
+#cpanel div.icon {
+ text-align: center;
+ margin-right: 5px;
+ float: left;
+ margin-bottom: 5px;
+}
+
+#cpanel div.icon a {
+ display: block;
+ float: left;
+ border: 1px solid #f0f0f0;
+ height: 97px;
+ width: 108px;
+ color: #666;
+ vertical-align: middle;
+ text-decoration: none;
+}
+
+#cpanel div.icon a:hover {
+ border-left: 1px solid #eee;
+ border-top: 1px solid #eee;
+ border-right: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+ background: #f9f9f9;
+ color: #0B55C4;
+}
+
+#cpanel img { padding: 10px 0; margin: 0 auto; }
+#cpanel span { display: block; text-align: center; }
+
+/* standard form style table */
+div.col { float: left; }
+div.width-45 { width: 45%; }
+div.width-55 { width: 55%; }
+div.width-50 { width: 50%; }
+div.width-70 { width: 70%; }
+div.width-30 { width: 30%; }
+div.width-60 { width: 60%; }
+div.width-40 { width: 40%; }
+
+table.admintable td { padding: 3px; }
+table.admintable td.key,
+table.admintable td.paramlist_key {
+ background-color: #f6f6f6;
+ text-align: right;
+ width: 140px;
+ color: #666;
+ font-weight: bold;
+ border-bottom: 1px solid #e9e9e9;
+ border-right: 1px solid #e9e9e9;
+}
+
+table.paramlist td.paramlist_description {
+ background-color: #f6f6f6;
+ text-align: left;
+ width: 170px;
+ color: #333;
+ font-weight: normal;
+ border-bottom: 1px solid #e9e9e9;
+ border-right: 1px solid #e9e9e9;
+}
+
+table.admintable td.key.vtop { vertical-align: top; }
+
+table.adminform {
+ background-color: #f9f9f9;
+ border: solid 1px #d5d5d5;
+ width: 100%;
+ border-collapse: collapse;
+ margin: 8px 0 10px 0;
+ margin-bottom: 15px;
+ width: 100%;
+}
+table.adminform.nospace { margin-bottom: 0; }
+table.adminform tr.row0 { background-color: #f9f9f9; }
+table.adminform tr.row1 { background-color: #eeeeee; }
+
+table.adminform th {
+ font-size: 11px;
+ padding: 6px 2px 4px 4px;
+ text-align: left;
+ height: 25px;
+ color: #000;
+ background-repeat: repeat;
+}
+table.adminform td { padding: 3px; text-align: left; }
+
+table.adminform td.filter{
+ text-align: left;
+}
+
+table.adminform td.helpMenu{
+ text-align: right;
+}
+
+
+fieldset.adminform { border: 1px solid #ccc; margin: 0 10px 10px 10px; }
+
+/** Table styles **/
+
+table.adminlist {
+ width: 100%;
+ border-spacing: 1px;
+ background-color: #e7e7e7;
+ color: #666;
+}
+
+table.adminlist td,
+table.adminlist th { padding: 4px; }
+
+table.adminlist thead th {
+ text-align: center;
+ background: #f0f0f0;
+ color: #666;
+ border-bottom: 1px solid #999;
+ border-left: 1px solid #fff;
+}
+
+table.adminlist thead a:hover { text-decoration: none; }
+
+table.adminlist thead th img { vertical-align: middle; }
+
+table.adminlist tbody th { font-weight: bold; }
+
+table.adminlist tbody tr { background-color: #fff;
text-align: left; }
+table.adminlist tbody tr.row1 { background: #f9f9f9; border-top: 1px solid
#fff; }
+
+table.adminlist tbody tr.row0:hover td,
+table.adminlist tbody tr.row1:hover td { background-color: #ffd ; }
+
+table.adminlist tbody tr td { height: 25px; background: #fff; border:
1px solid #fff; }
+table.adminlist tbody tr.row1 td { background: #f9f9f9; border-top: 1px solid
#FFF; }
+
+table.adminlist tfoot tr { text-align: center; color: #333; }
+table.adminlist tfoot td,
+table.adminlist tfoot th { background-color: #f3f3f3; border-top: 1px solid
#999; text-align: center; }
+
+table.adminlist td.order { text-align: center; white-space:
nowrap; }
+table.adminlist td.order span { float: left; display: block; width: 20px;
text-align: center; }
+
+table.adminlist .pagination { display:table; padding:0; margin:0 auto;
}
+
+.pagination div.limit {
+ float: left;
+ height: 22px;
+ line-height: 22px;
+ margin: 0 10px;
+}
+
+/** stu nicholls solution for centering divs **/
+.container {clear:both; text-decoration:none;}
+* html .container {display:inline-block;}
+
+/** table solution for global config **/
+table.noshow { width: 100%; border-collapse: collapse;
padding: 0; margin: 0; }
+table.noshow tr { vertical-align: top; }
+table.noshow td { }
+table.noshow fieldset { margin: 15px 7px 7px 7px; }
+
+#editor-xtd-buttons { padding: 5px; }
+
+/* -- buttons -> STILL NEED CLEANUP*/
+
+.button1,
+.button1 div{
+ height: 1%;
+ float: right;
+}
+
+.button2-left,
+.button2-right,
+.button2-left div,
+.button2-right div {
+ float: left;
+}
+
+.button1 { background: url(../images/j_button1_left.png) no-repeat;
white-space: nowrap; padding-left: 10px; margin-left: 5px;}
+
+.button1 .next { background: url(../images/j_button1_next.png) 100% 0
no-repeat; }
+
+.button1 a {
+ display: block;
+ height: 26px;
+ float: left;
+ line-height: 26px;
+ font-size: 12px;
+ font-weight: bold;
+ color: #333;
+ cursor: pointer;
+ padding: 0 30px 0 6px;
+}
+
+.button1 a:hover { text-decoration: none; color: #0B55C4; }
+
+.button2-left a,
+.button2-right a,
+.button2-left span,
+.button2-right span {
+ display: block;
+ height: 22px;
+ float: left;
+ line-height: 22px;
+ font-size: 11px;
+ color: #333;
+ cursor: pointer;
+}
+
+.button2-left span,
+.button2-right span { cursor: default; color: #999; }
+
+.button2-left .page a,
+.button2-right .page a,
+.button2-left .page span,
+.button2-right .page span,
+.button2-left .blank a,
+.button2-right .blank a,
+.button2-left .blank span,
+.button2-right .blank span { padding: 0 6px; }
+
+.page span,
+.blank span {
+ color: #000;
+ font-weight: bold;
+}
+
+.button2-left a:hover,
+.button2-right a:hover { text-decoration: none; color: #0B55C4; }
+
+.button2-left a,
+.button2-left span { padding: 0 24px 0 6px; }
+
+.button2-right a,
+.button2-right span { padding: 0 6px 0 24px; }
+
+.button2-left { background: url(../images/j_button2_left.png) no-repeat;
float: left; margin-left: 5px; }
+
+.button2-right { background: url(../images/j_button2_right.png) 100% 0
no-repeat; float: left; margin-left: 5px; }
+
+.button2-right .prev { background: url(../images/j_button2_prev.png)
no-repeat; }
+
+.button2-right.off .prev { background: url(../images/j_button2_prev_off.png)
no-repeat; }
+
+.button2-right .start { background: url(../images/j_button2_first.png)
no-repeat; }
+
+.button2-right.off .start { background: url(../images/j_button2_first_off.png)
no-repeat; }
+
+.button2-left .page,
+.button2-left .blank { background: url(../images/j_button2_right_cap.png) 100%
0 no-repeat; }
+
+.button2-left .next { background: url(../images/j_button2_next.png) 100% 0
no-repeat; }
+
+.button2-left.off .next { background: url(../images/j_button2_next_off.png)
100% 0 no-repeat; }
+
+.button2-left .end { background: url(../images/j_button2_last.png) 100% 0
no-repeat; }
+
+.button2-left.off .end { background: url(../images/j_button2_last_off.png)
100% 0 no-repeat; }
+
+.button2-left .image { background:
url(../images/j_button2_image.png) 100% 0 no-repeat; }
+.button2-left .readmore { background:
url(../images/j_button2_readmore.png) 100% 0 no-repeat; }
+.button2-left .pagebreak { background:
url(../images/j_button2_pagebreak.png) 100% 0 no-repeat; }
+.button2-left .blank { background:
url(../images/j_button2_blank.png) 100% 0 no-repeat; }
+
+/* Tooltips */
+.tool-tip {
+ float: left;
+ background: #ffc;
+ border: 1px solid #D4D5AA;
+ padding: 5px;
+ max-width: 200px;
+ z-index: 50;
+}
+
+.tool-title {
+ padding: 0;
+ margin: 0;
+ font-size: 100%;
+ font-weight: bold;
+ margin-top: -15px;
+ padding-top: 15px;
+ padding-bottom: 5px;
+ background: url(../images/selector-arrow.png) no-repeat;
+}
+
+.tool-text {
+ font-size: 100%;
+ margin: 0;
+}
+
+/* Calendar */
+a img.calendar {
+ width: 16px;
+ height: 16px;
+ margin-left: 3px;
+ background: url(../images/calendar.png) no-repeat;
+ cursor: pointer;
+ vertical-align: middle;
+}
+
+/* System Standard Messages */
+#system-message dd.message ul { background: #C3D2E5
url(../images/notice-info.png) 4px center no-repeat;}
+
+/* System Error Messages */
+#system-message dd.error ul { color: #c00; background: #E6C0C0
url(../images/notice-alert.png) 4px top no-repeat; border-top: 3px solid
#DE7A7B; border-bottom: 3px solid #DE7A7B;}
+
+/* System Notice Messages */
+#system-message dd.notice ul { color: #c00; background: #EFE7B8
url(../images/notice-note.png) 4px top no-repeat; border-top: 3px solid
#F0DC7E; border-bottom: 3px solid #F0DC7E;}
Modified: branches/Version-1_0-branch/phpgwapi/templates/base/css/login.css
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/css/login.css
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/css/login.css
2010-10-10 17:22:31 UTC (rev 6465)
@@ -1,104 +1,95 @@
-body
-{
- background: #537991 url('../images/logo-large.png') no-repeat fixed top
left;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 11px;
- color: #537991;
+/**
+* @version $Id: login.css 14401 2010-01-26 14:10:00Z louis $
+* @copyright Copyright (C) 2005 - 2010 Open Source Matters. All rights
reserved.
+* @license GNU/GPL, see LICENSE.php
+* Joomla! is free software. This version may have been modified pursuant
+* to the GNU General Public License, and as distributed it includes or
+* is derivative of works licensed under the GNU General Public License or
+* other free or open source software licenses.
+* See COPYRIGHT.php for copyright notices and details.
+*/
+
+/**
+ * Adopted from the Joomla! 1.5 Admin template main css file
+ *
+ * @author Andy Miller <address@hidden>
+ * @package Joomla
+ * @since 1.5
+ * @version 1.0
+ */
+
+/* -- Imported styles ----------------------------- */
+
address@hidden url("joomla_general.css");
+
+/* -- Specific styles ----------------------------- */
+
+form { margin: 0px; padding: 0px; }
+form .inputbox { width: 120px; margin-left: 10px; }
+form br { display: none; }
+.login { margin: 0 auto; width: 500px; margin-bottom: 100px; }
+
+h1 {
+ margin: 15px 0;
}
-#horizon
-{
- background-color: transparent;
- position: absolute;
- top: 50%;
- left: 0px;
- width: 100%;
- margin-top: -175px;
- min-width: 800px;
+p {
+ margin: 0;
+ padding: 0;
+ margin-bottom: 10px;
}
-label, input[type=text], input[type=password], select, textarea
-{
- display: block;
- float: left;
- margin-bottom: 8px;
- width: 150px;
+#lock {
+ background: url(../images/j_login_lock.jpg) 50% 0 no-repeat;
+ width: 150px;
+ height: 137px;
}
-input, select
-{
- background: #fff;
- border: 1px solid #537991;
- color: #537991;
- float: left;
- width: 100px;
+#content-box .m {
+ padding: 10px;
}
-p.button_group input
-{
- float: none;
- width: auto;
+#content-box .padding {
+ padding: 30px 0;
}
-label, input[type=text], input[type=password], input[type=checkbox],
input[type=radio], select, textarea
-{
- margin-bottom: 8px;
-}
+#section-box { float: right; width: 320px; margin-left: 10px;}
-label
-{
- text-align: right;
- padding-right: 10px;
- font-weight: bold;
- clear: left;
- display: block;
- float: left;
- margin-left: 50px;
- width: 75px;
- color: #537991;
+#section-box .m {
+ padding: 5px;
}
-
-br
-{
- clear: left;
+#section-box .padding {
+ background: none; padding: 0;
}
-#loginbox
-{
- background-color: #fff;
- border: 1px solid #999;
- margin: 0px auto;
- width: 450px;
- -moz-border-radius: 15px;
-}
+.button { text-align: right; }
-#logintitle
-{
- background-color: #ccc;
- border-bottom: 1px solid #537991;
- color: #537991;
- font-size: large;
- margin-bottom: 25px;
- padding: 5px;
+.login-form { text-align: left; width: 60%; }
+.login-form h1 { display: none; }
+.login-form p { padding: 0 1em 0 1em; }
- -moz-border-radius-topleft: 15px;
- -moz-border-radius-topright: 15px;
+.login-text { text-align: left; width: 40%; float: left; }
+
+#form-login label {
+ display: block;
+ float: left;
+ width: 120px;
+ text-align: right;
+ padding: 4px;
+ color: #666;
+ font-weight: bold;
}
-#loginmsg, #loginmsg a, #testjs, #testjs a
-{
- color: #fff;
- margin: 25px auto;
- text-align: center;
- width: 700px;
+#form-login .button_holder {
+ float: left;
+ padding-left: 180px;
}
-#testjs
-{
- font-weight: bold;
+#form-login div.button1{
+ float: left;
}
-#version
-{
- text-align: right;
+#form-login div.button1 div.next {
+ float: left;
}
+
Copied: branches/Version-1_0-branch/phpgwapi/templates/base/css/rounded.css
(from rev 6464, trunk/phpgwapi/templates/base/css/rounded.css)
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/css/rounded.css
(rev 0)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/css/rounded.css
2010-10-10 17:22:31 UTC (rev 6465)
@@ -0,0 +1,117 @@
+/** rounded corners **/
+div#toolbar-box {
+ background: #f7f7f7;
+}
+
+div#element-box {
+ background: #fff;
+}
+
+div#element-box div.section-box div.m {
+ background: #fbfbfb;
+
+}
+
+div.t, div.b {
+ height: 6px;
+ padding: 0;
+ margin: 0;
+ overflow: hidden;
+}
+
+div.m {
+ border-left: 1px solid #ccc;
+ border-right: 1px solid #ccc;
+ padding: 0 8px;
+}
+
+div#toolbar-box div.m {
+ padding: 0;
+}
+
+div#element-box div.m {
+ padding: 5px 10px;
+}
+
+div#submenu-box div.t {
+ background: url(../images/j_border.png) 0 0 repeat-x;
+}
+
+div#submenu-box div.t div.t {
+ background: url(../images/j_crn_tr_dark.png) 100% 0 no-repeat;
+}
+
+div#submenu-box div.t div.t div.t {
+ background: url(../images/j_crn_tl_dark.png) 0 0 no-repeat;
+}
+
+div#submenu-box div.b {
+ background: url(../images/j_border.png) 0 100% repeat-x;
+}
+
+div#submenu-box div.b div.b {
+ background: url(../images/j_crn_br_dark.png) 100% 0 no-repeat;
+}
+
+div#submenu-box div.b div.b div.b {
+ background: url(../images/j_crn_bl_dark.png) 0 0 no-repeat;
+}
+
+div#toolbar-box,
+div#element-box div.section-box {
+ background: #fbfbfb;
+}
+
+div#toolbar-box div.t,
+div#element-box div.section-box div.t {
+ background: url(../images/j_border.png) 0 0 repeat-x;
+}
+
+div#toolbar-box div.t div.t,
+div#element-box div.section-box div.t div.t {
+ background: url(../images/j_crn_tr_med.png) 100% 0 no-repeat;
+}
+
+div#toolbar-box div.t div.t div.t,
+div#element-box div.section-box div.t div.t div.t {
+ background: url(../images/j_crn_tl_med.png) 0 0 no-repeat;
+}
+
+div#toolbar-box div.b,
+div#element-box div.section-box div.b {
+ background: url(../images/j_border.png) 0 100% repeat-x;
+}
+
+div#toolbar-box div.b div.b,
+div#element-box div.section-box div.b div.b {
+ background: url(../images/j_crn_br_med.png) 100% 0 no-repeat;
+}
+
+div#toolbar-box div.b div.b div.b,
+div#element-box div.section-box div.b div.b div.b {
+ background: url(../images/j_crn_bl_med.png) 0 0 no-repeat;
+}
+
+div#element-box div.t {
+ background: url(../images/j_border.png) 0 0 repeat-x;
+}
+
+div#element-box div.t div.t {
+ background: url(../images/j_crn_tr_light.png) 100% 0 no-repeat;
+}
+
+div#element-box div.t div.t div.t {
+ background: url(../images/j_crn_tl_light.png) 0 0 no-repeat;
+}
+
+div#element-box div.b {
+ background: url(../images/j_border.png) 0 100% repeat-x;
+}
+
+div#element-box div.b div.b {
+ background: url(../images/j_crn_br_light.png) 100% 0 no-repeat;
+}
+
+div#element-box div.b div.b div.b {
+ background: url(../images/j_crn_bl_light.png) 0 0 no-repeat;
+}
Copied: branches/Version-1_0-branch/phpgwapi/templates/base/css/system.css
(from rev 6464, trunk/phpgwapi/templates/base/css/system.css)
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/css/system.css
(rev 0)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/css/system.css
2010-10-10 17:22:31 UTC (rev 6465)
@@ -0,0 +1,28 @@
+/* OpenID icon style */
+input.system-openid, input.com-system-openid {
+ background: url(http://openid.net/login-bg.gif) no-repeat;
+ background-color: #fff;
+ background-position: 0 50%;
+ color: #000;
+ padding-left: 18px;
+
+}
+
+body {color: #000}
+/* System Messages */
+#system-message { margin-bottom: 10px; padding: 0;}
+#system-message dt { font-weight: bold; }
+#system-message dd { margin: 0; font-weight: bold; text-indent: 30px; }
+#system-message dd ul { color: #0055BB; margin-bottom: 10px; list-style: none;
padding: 10px; border-top: 3px solid #84A7DB; border-bottom: 3px solid #84A7DB;}
+
+/* System Standard Messages */
+#system-message dt.message { display: none; }
+#system-message dd.message { }
+
+/* System Error Messages */
+#system-message dt.error { display: none; }
+#system-message dd.error ul { color: #c00; background-color: #E6C0C0;
border-top: 3px solid #DE7A7B; border-bottom: 3px solid #DE7A7B;}
+
+/* System Notice Messages */
+#system-message dt.notice { display: none; }
+#system-message dd.notice ul { color: #c00; background: #EFE7B8; border-top:
3px solid #F0DC7E; border-bottom: 3px solid #F0DC7E;}
\ No newline at end of file
Copied: branches/Version-1_0-branch/phpgwapi/templates/base/images/j_border.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_border.png)
===================================================================
(Binary files differ)
Copied: branches/Version-1_0-branch/phpgwapi/templates/base/images/j_bottom.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_bottom.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_button1_left.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_button1_left.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_button1_next.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_button1_next.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_corner_bl.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_corner_bl.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_corner_br.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_corner_br.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_bl_dark.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_bl_dark.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_bl_light.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_bl_light.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_bl_med.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_bl_med.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_br_dark.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_br_dark.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_br_light.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_br_light.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_br_med.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_br_med.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tl_dark.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_tl_dark.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tl_light.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_tl_light.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tl_med.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_tl_med.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tr_dark.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_tr_dark.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tr_light.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_tr_light.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_crn_tr_med.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_crn_tr_med.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_header_left.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_header_left.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_header_middle.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_header_middle.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_header_right.png
(from rev 6464, trunk/phpgwapi/templates/base/images/j_header_right.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/j_login_lock.jpg
(from rev 6464, trunk/phpgwapi/templates/base/images/j_login_lock.jpg)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/notice-alert.png
(from rev 6464, trunk/phpgwapi/templates/base/images/notice-alert.png)
===================================================================
(Binary files differ)
Copied:
branches/Version-1_0-branch/phpgwapi/templates/base/images/notice-info.png
(from rev 6464, trunk/phpgwapi/templates/base/images/notice-info.png)
===================================================================
(Binary files differ)
Modified: branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/templates/base/login.tpl
2010-10-10 17:22:31 UTC (rev 6465)
@@ -1,87 +1,183 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
- "http://www.w3.org/TR/html4/loose.dtd";>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd";>
<html>
<!-- BEGIN login_form -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <meta name="author" content="phpGroupWare http://www.phpgroupware.org";>
+ <meta name="author" content="phpGroupWare http://www.phpgroupware.no";>
<meta name="description" content="{website_title} login screen, working
environment powered by phpGroupWare">
<meta name="keywords" content="{website_title} login screen,
phpgroupware, groupware, groupware suite">
<meta name="robots" content="noindex,nofollow">
<title>{website_title} - {lang_login}</title>
- <link rel="stylesheet" href="{base_css}" type="text/css">
+ <link rel="stylesheet" href="phpgwapi/templates/base/css/system.css"
type="text/css">
<link rel="stylesheet" href="{login_css}" type="text/css">
- <script type="text/javascript">
+ <!--[if IE 7]>
+ <link href="templates/khepri/css/ie7.css" rel="stylesheet"
type="text/css" />
+ <![endif]-->
+
+ <!--[if lte IE 6]>
+ <link href="templates/khepri/css/ie6.css" rel="stylesheet"
type="text/css" />
+ <![endif]-->
+
+ <link rel="stylesheet" type="text/css"
href="phpgwapi/templates/base/css/rounded.css">
+
+ <script language="javascript" type="text/javascript">
<!--
window.onload = function()
{
- document.getElementById('testjs').style.display =
'none';
- document.getElementById('login').focus();
+ document.login.login.select();
+ document.login.login.focus();
}
-->
</script>
</head>
<body>
- <div id="horizon">
-
- <div id="loginmsg">{lang_message}</div>
-
- <form name="login" method="post" action="{login_url}"
{autocomplete}>
- <div id="loginbox">
- <div id="logintitle">{website_title} -
{lang_login}</div>
- <p class="msg">{cd}</p>
- <input type="hidden" name="passwd_type" value="text">
- <!-- BEGIN loging_block -->
- <label for="login">{lang_username}:</label>
- <input type="text" value="{last_loginid}" name="login"
id="login"{login_read_only}>
- <input type="hidden" name="skip_remote"
value="{skip_remote}">
- <!-- END loging_block -->
- <!-- BEGIN domain_from_host -->
- @{logindomain}<input type="hidden"
name="logindomain" value="{logindomain}">
- <!-- END domain_from_host -->
- <br>
- <!-- BEGIN login_additional_info -->
- <label for="firstname">{lang_firstname}:</label>
- <input type="text" value="{firstname}" maxlength="100"
name="firstname" id="firstname">
- <br>
+ <div id="border-top" class="h_green">
+ <div>
+ <div>
+ <span class="title">{system}</span>
+ </div>
+ </div>
+ </div>
+
+ <div id="content-box">
+ <div class="padding">
+ <div id="element-box" class="login">
+ <div class="t">
+ <div class="t">
+ <div class="t"></div>
+ </div>
+ </div>
- <label for="lastname">{lang_lastname}:</label>
- <input type="text" value="{lastname}" name="lastname"
id="lastname" maxlength="100">
- <br>
+ <div class="m">
+ <h1>{system} {lang_login}</h1>
- <!-- END login_additional_info -->
- <!-- BEGIN password_block -->
- <label for="passwd">{lang_password}:</label>
- <input type="password" name="passwd" id="passwd"><br>
- <!-- END password_block -->
- <!-- BEGIN login_check_passwd -->
- <label
for="passwd_confirm">{lang_confirm_password}:</label>
- <input type="password" name="passwd_confirm"
id="passwd_confirm"><br>
+ <!-- BEGIN message_block -->
+ <dl id="system-message">
+ <dt
class="{message_class}">{lang_message}</dt>
+ <dd
class="{message_class_item}">
+ <ul>
+ <li>{cd}</li>
+ </ul>
+ </dd>
+ </dl>
+ <!-- END message_block -->
- <!-- END login_check_passwd -->
- <!-- BEGIN domain_select -->
- <label for="logindomain">{lang_domain}:</label>
- <select name="logindomain" id="logindomain">
- <!-- BEGIN domain_option -->
- <option value="{domain_name}"
{domain_selected}>{domain_name}</option>
- <!-- END domain_option -->
- </select><br>
- <!-- END domain_select -->
- <!-- BEGIN button_block -->
- <p class="button_group"><input type="submit"
value="{lang_login}" name="submitit"></p>
- <p class="link_group"><a
href="{return_sso_login_url}">{lang_return_sso_login}</a></p>
- <!-- END button_block -->
- <p id="version">{system} {version}</p>
+ <div id="section-box">
+ <div class="t">
+ <div class="t">
+ <div
class="t"></div>
+ </div>
+ </div>
+
+ <div class="m">
+
+ <form name="login"
method="post" action="{login_url}" {autocomplete} id="form-login" style="clear:
both;">
+ <input
type="hidden" name="passwd_type" value="text">
+ <!-- BEGIN
loging_block -->
+ <p
id="form-login-username">
+ <label
for="modlgn_username">{lang_username}</label>
+ <input
type="text" value="{last_loginid}" name="login" id="modlgn_username"
{login_read_only} class="inputbox" size="15" >
+ <input
type="hidden" name="skip_remote" value="{skip_remote}">
+ </p>
+ <!-- END
loging_block -->
+ <!-- BEGIN
domain_from_host -->
+
@{logindomain}<input type="hidden" name="logindomain" value="{logindomain}">
+ <!-- END
domain_from_host -->
+ <br>
+ <!-- BEGIN
login_additional_info -->
+ <label
for="firstname">{lang_firstname}:</label>
+ <input
type="text" value="{firstname}" maxlength="100" name="firstname" id="firstname">
+ <br>
+
+ <label
for="lastname">{lang_lastname}:</label>
+ <input
type="text" value="{lastname}" name="lastname" id="lastname" maxlength="100">
+ <br>
+
+ <!-- END
login_additional_info -->
+ <!-- BEGIN
password_block -->
+ <p
id="form-login-password">
+ <label
for="passwd">{lang_password}</label>
+ <input
type="password" name="passwd" id="passwd" class="inputbox" size="15">
+ </p>
+ <!-- END
password_block -->
+ <!-- BEGIN
login_check_passwd -->
+ <label
for="passwd_confirm">{lang_confirm_password}:</label>
+ <input
type="password" name="passwd_confirm" id="passwd_confirm" class="inputbox"
size="15"><br>
+
+ <!-- END
login_check_passwd -->
+ <!-- BEGIN
domain_select -->
+ <p
id="form-login-domain" style="clear: both;">
+ <label
for="logindomain">{lang_domain}:</label>
+ <select
name="logindomain" id="logindomain" class="inputbox">
+ <!--
BEGIN domain_option -->
+ <option
value="{domain_name}" {domain_selected}>{domain_name}</option>
+ <!--
END domain_option -->
+ </select>
+ </p>
+ <!-- END
domain_select -->
+ <!-- BEGIN
button_block -->
+ <div
class="button_holder">
+
<div class="button1">
+
<div class="next">
+
<a onclick="login.submit();">Login</a>
+
</div>
+
</div>
+ </div>
+
+ <div
class="clr"></div>
+ <input
type="hidden" name="submitit" value="1">
+ <input
type="submit" style="border: 0; padding: 0; margin: 0; width: 0px; height:
0px;" value="{lang_login}" name="submitit_">
+
+ <p
class="link_group"><a
href="{return_sso_login_url}">{lang_return_sso_login}</a></p>
+
+ <!-- END
button_block -->
+
+ </form>
+
+ <div class="clr"></div>
+ </div>
+
+ <div class="b">
+ <div class="b">
+ <div
class="b"></div>
+ </div>
+ </div>
+ </div>
+
+ <p>Use a valid username and password to
gain access to {system}.</p>
+
+ <div id="lock"></div>
+
+ <div class="clr"></div>
+ </div>
+
+ <div class="b">
+ <div class="b">
+ <div class="b"></div>
+ </div>
+ </div>
+ </div>
+ <noscript>Warning! JavaScript must be enabled for
proper operation of the Administrator back-end.</noscript>
+ <div class="clr"></div>
</div>
- </form>
- <div id="testjs">
- {lang_testjs}<br>
+ </div>
+ <div id="border-bottom">
+ <div>
+ <div>
</div>
</div>
+</div>
+<div id="footer">
+ <p class="copyright">
+ <a href="http://www.porticoestate.no"; target="_blank">{system}
{version}</a> is Free Software released under the <a href=
+ "http://www.gnu.org/licenses/gpl-2.0.html";>GNU/GPL License</a>.
+ </p>
+ </div>
</body>
<!-- END login_form -->
</html>
Modified: branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.inc.php
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -45,6 +45,10 @@
HTML;
}
+ $app = $GLOBALS['phpgw_info']['flags']['currentapp'];
+ $menu_array = execMethod('phpgwapi.menu.get_local_menu', $app);
+ $var['app_menu'] =
phpgwapi_menu::render_horisontal_menu($menu_array);
+
$var['applications'] = $applications;
$var['logo'] = 'logo.png';
Modified: branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.tpl
===================================================================
--- branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.tpl
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/phpgwapi/templates/verdilak/navbar.tpl
2010-10-10 17:22:31 UTC (rev 6465)
@@ -26,6 +26,7 @@
<table border="0" cellpadding="5" width="100%">
<tr>
<td id="phpgw_body">
+ {app_menu}
<!-- END navbar -->
<!-- BEGIN preferences --><a href="{preferences_url}"><img
src="{preferences_img}" border="0" alt="{preferences_text}"></a><!-- END
preferences -->
Modified: branches/Version-1_0-branch/property/inc/class.bogab.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bogab.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/property/inc/class.bogab.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -141,6 +141,25 @@
'cat_id' => $this->cat_id,'location_code' => $location_code,
'gaards_nr' => $gaards_nr,'bruksnr' => $bruksnr,'feste_nr' => $feste_nr,
'seksjons_nr' => $seksjons_nr,'address' => $address,'check_payments' =>
$check_payments));
+/*
+ foreach ($gab as &$_gab)
+ {
+ $location_data =
$this->solocation->read_single($_gab['location_code']);
+
+ if(isset($location_data['street_name']) &&
$location_data['street_name'])
+ {
+ $_gab['address'] =
"{$location_data['street_name']} {$location_data['street_number']}";
+ }
+ elseif($location_data['loc2_name'])
+ {
+ $_gab['address'] =
$location_data['loc2_name'];
+ }
+ elseif($location_data['loc1_name'])
+ {
+ $_gab['address'] =
$location_data['loc1_name'];
+ }
+ }
+*/
$this->total_records = $this->so->total_records;
$this->payment_date = $this->so->payment_date;
return $gab;
Modified: branches/Version-1_0-branch/property/inc/class.solocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/property/inc/class.solocation.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -37,6 +37,7 @@
var $bocommon;
var $total_records;
+ protected $global_lock = false;
function __construct($bocommon = '')
{
@@ -1340,7 +1341,14 @@
function update_location()
{
- $this->db->transaction_begin();
+ if ( $this->db->Transaction )
+ {
+ $this->global_lock = true;
+ }
+ else
+ {
+ $this->db->transaction_begin();
+ }
$this->db->query('SELECT max(id) as levels FROM
fm_location_type');
$this->db->next_record();
@@ -1428,17 +1436,19 @@
}
}
- if( $this->db->transaction_commit() )
+ if ( !$this->global_lock )
{
- return $receipt;
+ if( $this->db->transaction_commit() )
+ {
+ return $receipt;
+ }
+ else
+ {
+ return
$receipt['error'][]=array('msg'=>lang('update failed'));
+ }
}
- else
- {
- return
$receipt['error'][]=array('msg'=>lang('update failed'));
- }
}
-
function read_summary($data='')
{
if(is_array($data))
Modified: branches/Version-1_0-branch/property/setup/default_records.inc.php
===================================================================
--- branches/Version-1_0-branch/property/setup/default_records.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/property/setup/default_records.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -705,3 +705,6 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_jasper_format_type (id)
VALUES ('XLS')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_jasper_format_type (id)
VALUES ('XHTML')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_jasper_format_type (id)
VALUES ('DOCX')");
+
+$solocation = createObject('property.solocation');
+$solocation->update_location();
Modified: branches/Version-1_0-branch/setup/applications.php
===================================================================
--- branches/Version-1_0-branch/setup/applications.php 2010-10-10 17:16:20 UTC
(rev 6464)
+++ branches/Version-1_0-branch/setup/applications.php 2010-10-10 17:22:31 UTC
(rev 6465)
@@ -113,6 +113,17 @@
}
$GLOBALS['phpgw_setup']->loaddb();
+
+
+ $GLOBALS['phpgw']->db = &$GLOBALS['phpgw_setup']->db;
+
+ $c = createObject('phpgwapi.config','phpgwapi');
+ $c->read();
+ foreach ($c->config_data as $k => $v)
+ {
+ $GLOBALS['phpgw_info']['server'][$k] = $v;
+ }
+
$GLOBALS['phpgw_info']['setup']['stage']['db'] =
$GLOBALS['phpgw_setup']->detection->check_db();
$setup_info = $GLOBALS['phpgw_setup']->detection->get_versions();
@@ -142,6 +153,7 @@
$GLOBALS['phpgw_setup']->process->init_process();
}
+//$GLOBALS['phpgw_setup']->process->add_credential('property');
if(!empty($remove) && is_array($remove))
{
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
@@ -219,6 +231,8 @@
}
$terror =
$GLOBALS['phpgw_setup']->process->add_langs($terror,$DEBUG,$force_en);
echo '<li>' . lang('%1 translations added',
lang($appname)) . ".</li>\n</ul>\n";
+ // Add credentials to admins
+
$GLOBALS['phpgw_setup']->process->add_credential($appname);
}
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit();
}
Modified: branches/Version-1_0-branch/setup/config.php
===================================================================
--- branches/Version-1_0-branch/setup/config.php 2010-10-10 17:16:20 UTC
(rev 6464)
+++ branches/Version-1_0-branch/setup/config.php 2010-10-10 17:22:31 UTC
(rev 6465)
@@ -77,7 +77,7 @@
$setup_tpl->set_var('lang_cookies_must_be_enabled', lang('<b>NOTE:</b>
You must have cookies enabled to use setup and header admin!') );
// Following to ensure windows file paths are saved correctly
- set_magic_quotes_runtime(0);
+ //set_magic_quotes_runtime(0);
$GLOBALS['phpgw_setup']->loaddb();
@@ -249,9 +249,10 @@
$setup_tpl->set_var($value, lang($newval));
break;
case 'value':
- $newval = ereg_replace(' ','_',$newval);
+ $newval = str_replace(' ','_',$newval);
/* Don't show passwords in the form */
- if(ereg('passwd',$value) ||
ereg('password',$value) || ereg('root_pw',$value))
+ // if(ereg('passwd',$value) ||
ereg('password',$value) || ereg('root_pw',$value))
+ if(preg_match('/(passwd|password|root_pw)/i',
$value))
{
$setup_tpl->set_var($value,'');
}
@@ -282,7 +283,7 @@
}
break;
case 'hook':
- $newval = ereg_replace(' ','_',$newval);
+ $newval = str_replace(' ','_',$newval);
$setup_tpl->set_var($value,
$newval($current_config) );
break;
default:
Modified: branches/Version-1_0-branch/setup/inc/functions.inc.php
===================================================================
--- branches/Version-1_0-branch/setup/inc/functions.inc.php 2010-10-10
17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/setup/inc/functions.inc.php 2010-10-10
17:22:31 UTC (rev 6465)
@@ -233,12 +233,14 @@
'text' => "$error_msg\n" . phpgw_parse_backtrace($bt)
);
+ // echo "\n<br>" . lang('ERROR : %1 in %2 at line %3', $error_msg,
$error_file, $error_line) . "<br>\n";
switch ( $error_level )
{
case E_USER_ERROR:
case E_ERROR:
$log_args['severity'] = 'F'; //all "ERRORS"
should be fatal
$log->fatal($log_args);
+ echo "\n<br>" . lang('ERROR Fatal: %1 in %2 at
line %3', $error_msg, $error_file, $error_line) . "<br>\n";
break;
case E_WARNING:
case E_USER_WARNING:
@@ -275,7 +277,7 @@
$f = fopen('./lang/languages','rb');
while($line = fgets($f,200))
{
- list($x,$y) = split("\t",$line);
+ list($x,$y) = explode("\t",$line);
$languages[$x]['lang'] = trim($x);
$languages[$x]['descr'] = trim($y);
$languages[$x]['available'] = False;
@@ -293,7 +295,7 @@
}
$d->close();
- //print_r($languages);
+// print_r($languages);
return $languages;
}
@@ -339,7 +341,7 @@
$GLOBALS['phpgw_info']['server']['app_images'] =
'templates/base/images';
- if($_POST['setting']['enable_mcrypt'] == 'True')
+ if(isset($_POST['setting']['enable_mcrypt']) &&
$_POST['setting']['enable_mcrypt'] == 'True')
{
$GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = true;
$_iv = $_POST['setting']['mcrypt_iv'];
Modified: branches/Version-1_0-branch/todo/setup/tables_update.inc.php
===================================================================
--- branches/Version-1_0-branch/todo/setup/tables_update.inc.php
2010-10-10 17:16:20 UTC (rev 6464)
+++ branches/Version-1_0-branch/todo/setup/tables_update.inc.php
2010-10-10 17:22:31 UTC (rev 6465)
@@ -716,10 +716,9 @@
$test[] = '0.9.13.004';
function todo_upgrade0_9_13_004()
{
-
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_todo','todo_assigned',array('type'
=> 'varchar','precision' => 255,'nullable' => False));
-
$GLOBALS['setup_info']['todo']['currentver'] = '0.9.15.001';
return $GLOBALS['setup_info']['todo']['currentver'];
+
}
$test[] = '0.9.14';
@@ -732,25 +731,34 @@
$test[] = '0.9.14.500';
function todo_upgrade0_9_14_500()
{
- $GLOBALS['setup_info']['todo']['currentver'] = '0.9.15.003';
+ $GLOBALS['setup_info']['todo']['currentver'] = '0.9.15.001';
return $GLOBALS['setup_info']['todo']['currentver'];
}
$test[] = '0.9.15.001';
function todo_upgrade0_9_15_001()
{
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_todo','todo_assigned',array('type'
=> 'varchar','precision' => 255,'nullable' => False));
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_todo','assigned_group',array('type'
=> 'varchar','precision' => 255,'nullable' => False));
- $GLOBALS['setup_info']['todo']['currentver'] = '0.9.15.002';
- return $GLOBALS['setup_info']['todo']['currentver'];
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['todo']['currentver'] =
'0.9.15.002';
+ return $GLOBALS['setup_info']['todo']['currentver'];
+ }
}
$test[] = '0.9.15.002';
function todo_upgrade0_9_15_002()
{
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_todo','entry_date',array('type'
=> 'int','precision' => 4,'default' => 0,'nullable' => False));
- $GLOBALS['setup_info']['todo']['currentver'] = '0.9.15.003';
- return $GLOBALS['setup_info']['todo']['currentver'];
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['todo']['currentver'] =
'0.9.15.003';
+ return $GLOBALS['setup_info']['todo']['currentver'];
+ }
}
-?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6465] merge 6448:6464 from trunk,
Sigurd Nes <=