EGroupware / egroupware

resources/setup/tables_current.inc.php

Spacing +24 added lines, -24 removed lines

@@ -14,26 +14,26 @@ 
 $phpgw_baseline = array(
 	'egw_resources' => array(
 		'fd' => array(
-			'res_id' => array('type' => 'auto','nullable' => False),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','meta' => 'category','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11','default' => '1'),
-			'useable' => array('type' => 'int','precision' => '11','default' => '1'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'res_id' => array('type' => 'auto', 'nullable' => False),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'meta' => 'category', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'useable' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'picture_src' => array('type' => 'varchar','precision' => '20'),
-			'accessory_of' => array('type' => 'int','precision' => '11','default' => '-1'),
-			'storage_info' => array('type' => 'varchar','precision' => '200'),
-			'inventory_number' => array('type' => 'varchar','precision' => '20'),
-			'deleted' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'res_creator' => array('type' => 'int','meta' => 'user','precision' => '11'),
-			'res_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'res_modifier' => array('type' => 'int','meta' => 'user','precision' => '11'),
-			'res_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8')
+			'picture_src' => array('type' => 'varchar', 'precision' => '20'),
+			'accessory_of' => array('type' => 'int', 'precision' => '11', 'default' => '-1'),
+			'storage_info' => array('type' => 'varchar', 'precision' => '200'),
+			'inventory_number' => array('type' => 'varchar', 'precision' => '20'),
+			'deleted' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'res_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '11'),
+			'res_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'res_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '11'),
+			'res_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8')
 		),
 		'pk' => array('res_id'),
 		'fk' => array(),
@@ -42,12 +42,12 @@ 
 	),
 	'egw_resources_extra' => array(
 		'fd' => array(
-			'extra_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'extra_name' => array('type' => 'varchar','meta' => 'cfname','precision' => '40','nullable' => False),
-			'extra_owner' => array('type' => 'int','meta' => 'account','precision' => '4','nullable' => False,'default' => '-1'),
-			'extra_value' => array('type' => 'varchar','meta' => 'cfvalue','precision' => '255','nullable' => False,'default' => '')
+			'extra_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'extra_name' => array('type' => 'varchar', 'meta' => 'cfname', 'precision' => '40', 'nullable' => False),
+			'extra_owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '4', 'nullable' => False, 'default' => '-1'),
+			'extra_value' => array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('extra_id','extra_name','extra_owner'),
+		'pk' => array('extra_id', 'extra_name', 'extra_owner'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()

resources/setup/tables_update.inc.php

Spacing +111 added lines, -111 removed lines

@@ -16,7 +16,7 @@ 
 
 function resources_upgrade0_0_1_008()
 {
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','picture_src',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'picture_src', array(
 		'type' => 'varchar',
 		'precision' => '20'
 	));
@@ -28,7 +28,7 @@ 
 
 function resources_upgrade0_0_1_012()
 {
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','picture_thumb',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'picture_thumb', array(
 		'type' => 'blob'
 	));
 
@@ -39,49 +39,49 @@ 
 
 function resources_upgrade0_0_1_013()
 {
-	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources', array(
 		'fd' => array(
 			'id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11'),
-			'useable' => array('type' => 'int','precision' => '11'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11'),
+			'useable' => array('type' => 'int', 'precision' => '11'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'accessories' => array('type' => 'varchar','precision' => '50'),
-			'picture_src' => array('type' => 'varchar','precision' => '20'),
+			'accessories' => array('type' => 'varchar', 'precision' => '50'),
+			'picture_src' => array('type' => 'varchar', 'precision' => '20'),
 			'picture_thumb' => array('type' => 'blob')
 		),
 		'pk' => array('id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'picture');
-	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+	), 'picture');
+	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources', array(
 		'fd' => array(
 			'id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11'),
-			'useable' => array('type' => 'int','precision' => '11'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11'),
+			'useable' => array('type' => 'int', 'precision' => '11'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'accessories' => array('type' => 'varchar','precision' => '50'),
-			'picture_src' => array('type' => 'varchar','precision' => '20')
+			'accessories' => array('type' => 'varchar', 'precision' => '50'),
+			'picture_src' => array('type' => 'varchar', 'precision' => '20')
 		),
 		'pk' => array('id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'picture_thumb');
+	), 'picture_thumb');
 
 	$GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.014';
 	return $GLOBALS['setup_info']['resources']['currentver'];
@@ -90,12 +90,12 @@ 
 
 function resources_upgrade0_0_1_014()
 {
-	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','quantity',array(
+	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources', 'quantity', array(
 		'type' => 'int',
 		'precision' => '11',
 		'default' => '1'
 	));
-	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','useable',array(
+	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources', 'useable', array(
 		'type' => 'int',
 		'precision' => '11',
 		'default' => '1'
@@ -108,16 +108,16 @@ 
 
 function resources_upgrade0_0_1_015()
 {
-	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','accessories',array(
+	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources', 'accessories', array(
 		'type' => 'varchar',
 		'precision' => '100'
 	));
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','accessory_only',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'accessory_only', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'default' => '0'
 	));
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','relatives',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'relatives', array(
 		'type' => 'varchar',
 		'precision' => '100'
 	));
@@ -129,70 +129,70 @@ 
 
 function resources_upgrade0_0_1_016()
 {
-	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources', array(
 		'fd' => array(
 			'id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11','default' => '1'),
-			'useable' => array('type' => 'int','precision' => '11','default' => '1'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'useable' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'accessories' => array('type' => 'varchar','precision' => '100'),
-			'picture_src' => array('type' => 'varchar','precision' => '20'),
-			'relatives' => array('type' => 'varchar','precision' => '100')
+			'accessories' => array('type' => 'varchar', 'precision' => '100'),
+			'picture_src' => array('type' => 'varchar', 'precision' => '20'),
+			'relatives' => array('type' => 'varchar', 'precision' => '100')
 		),
 		'pk' => array('id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'accessory_only');
-	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+	), 'accessory_only');
+	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources', array(
 		'fd' => array(
 			'id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11','default' => '1'),
-			'useable' => array('type' => 'int','precision' => '11','default' => '1'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'useable' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'accessories' => array('type' => 'varchar','precision' => '100'),
-			'picture_src' => array('type' => 'varchar','precision' => '20')
+			'accessories' => array('type' => 'varchar', 'precision' => '100'),
+			'picture_src' => array('type' => 'varchar', 'precision' => '20')
 		),
 		'pk' => array('id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'relatives');
-	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+	), 'relatives');
+	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources', array(
 		'fd' => array(
 			'id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11','default' => '1'),
-			'useable' => array('type' => 'int','precision' => '11','default' => '1'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'useable' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'picture_src' => array('type' => 'varchar','precision' => '20')
+			'picture_src' => array('type' => 'varchar', 'precision' => '20')
 		),
 		'pk' => array('id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'accessories');
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','accessory_of',array(
+	), 'accessories');
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'accessory_of', array(
 		'type' => 'int',
 		'precision' => '11',
 		'default' => '-1'
@@ -204,22 +204,22 @@ 
 
 function resources_upgrade0_0_1_017()
 {
-	$GLOBALS['phpgw_setup']->oProc->RenameColumn('egw_resources','id','res_id');
-	$GLOBALS['phpgw_setup']->oProc->RefreshTable('egw_resources',array(
+	$GLOBALS['phpgw_setup']->oProc->RenameColumn('egw_resources', 'id', 'res_id');
+	$GLOBALS['phpgw_setup']->oProc->RefreshTable('egw_resources', array(
 		'fd' => array(
 			'res_id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11','default' => '1'),
-			'useable' => array('type' => 'int','precision' => '11','default' => '1'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'useable' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'picture_src' => array('type' => 'varchar','precision' => '20'),
-			'accessory_of' => array('type' => 'int','precision' => '11','default' => '-1')
+			'picture_src' => array('type' => 'varchar', 'precision' => '20'),
+			'accessory_of' => array('type' => 'int', 'precision' => '11', 'default' => '-1')
 		),
 		'pk' => array('res_id'),
 		'fk' => array(),
@@ -234,7 +234,7 @@ 
 
 function resources_upgrade0_0_1_018()
 {
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','storage_info',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'storage_info', array(
 		'type' => 'varchar',
 		'precision' => '200'
 	));
@@ -246,7 +246,7 @@ 
 
 function resources_upgrade0_0_1_019()
 {
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','inventory_number',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'inventory_number', array(
 		'type' => 'varchar',
 		'precision' => '20'
 	));
@@ -258,14 +258,14 @@ 
 
 function resources_upgrade0_0_1_020()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_resources_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_resources_extra', array(
 		'fd' => array(
-			'extra_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'extra_name' => array('type' => 'varchar','precision' => '40','nullable' => False),
-			'extra_owner' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '-1'),
-			'extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+			'extra_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'extra_name' => array('type' => 'varchar', 'precision' => '40', 'nullable' => False),
+			'extra_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '-1'),
+			'extra_value' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('extra_id','extra_name','extra_owner'),
+		'pk' => array('extra_id', 'extra_name', 'extra_owner'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -298,20 +298,20 @@ 
 	Vfs::load_wrapper('sqlfs');
 	if (Vfs::is_dir('/resources/pictures'))
 	{
-		Vfs::remove('/resources/pictures/thumbs');	// remove thumb dir incl. thumbnails
-		foreach(Vfs::find('sqlfs://default/resources/pictures',array('url' => true)) as $url)
+		Vfs::remove('/resources/pictures/thumbs'); // remove thumb dir incl. thumbnails
+		foreach (Vfs::find('sqlfs://default/resources/pictures', array('url' => true)) as $url)
 		{
-			if (is_numeric($id = basename($url,'.jpg')))
+			if (is_numeric($id = basename($url, '.jpg')))
 			{
 				if (!Vfs::is_dir($dir = "/apps/resources/$id"))
 				{
-					Vfs::mkdir($dir,0777,STREAM_MKDIR_RECURSIVE);
+					Vfs::mkdir($dir, 0777, STREAM_MKDIR_RECURSIVE);
 				}
-				rename($url,'sqlfs://default'.$dir.'/.picture.jpg');	// we need to rename on the same wrapper!
+				rename($url, 'sqlfs://default'.$dir.'/.picture.jpg'); // we need to rename on the same wrapper!
 			}
 		}
-		Vfs::rmdir('/resources/pictures',0);
-		Vfs::rmdir('/resources',0);
+		Vfs::rmdir('/resources/pictures', 0);
+		Vfs::rmdir('/resources', 0);
 	}
 	return $GLOBALS['setup_info']['resources']['currentver'] = '1.6';
 }
@@ -326,14 +326,14 @@ 
 function resources_upgrade1_8()
 {
 	// add location category required for CalDAV to distinguish between locations and resources
-	$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table,array('cat_parent' => 0, 'cat_owner' => Api\Categories::GLOBAL_ACCOUNT,'cat_access' => 'public','cat_appname' => 'resources','cat_name' => 'Locations','cat_description' => 'This category has been added by setup','last_mod' => time()),false,__LINE__,__FILE__);
-	$locations_cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table,'cat_id');
+	$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table, array('cat_parent' => 0, 'cat_owner' => Api\Categories::GLOBAL_ACCOUNT, 'cat_access' => 'public', 'cat_appname' => 'resources', 'cat_name' => 'Locations', 'cat_description' => 'This category has been added by setup', 'last_mod' => time()), false, __LINE__, __FILE__);
+	$locations_cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table, 'cat_id');
 	Api\Config::save_value('location_cats', $locations_cat_id, 'resources');
 
 	// Give default group all rights to this general cat
-	$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
-	$GLOBALS['egw_setup']->add_acl('resources','run',$defaultgroup);
-	$GLOBALS['egw_setup']->add_acl('resources',"L$locations_cat_id",$defaultgroup,399);
+	$defaultgroup = $GLOBALS['egw_setup']->add_account('Default', 'Default', 'Group', False, False);
+	$GLOBALS['egw_setup']->add_acl('resources', 'run', $defaultgroup);
+	$GLOBALS['egw_setup']->add_acl('resources', "L$locations_cat_id", $defaultgroup, 399);
 
 	return $GLOBALS['setup_info']['resources']['currentver'] = '1.9.001';
 }
@@ -341,7 +341,7 @@ 
 
 function resources_upgrade1_9_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources','deleted',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources', 'deleted', array(
 		'type' => 'int',
 		'precision' => '8'
 	));
@@ -358,22 +358,22 @@ 
 
 function resources_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources','res_creator',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources', 'res_creator', array(
 		'type' => 'int',
 		'meta' => 'user',
 		'precision' => '11'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources','res_created',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources', 'res_created', array(
 		'type' => 'int',
 		'meta' => 'timestamp',
 		'precision' => '8'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources','res_modifier',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources', 'res_modifier', array(
 		'type' => 'int',
 		'meta' => 'user',
 		'precision' => '11'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources','res_modified',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources', 'res_modified', array(
 		'type' => 'int',
 		'meta' => 'timestamp',
 		'precision' => '8'

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -333,7 +333,7 @@
 	// Give default group all rights to this general cat
 	$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
 	$GLOBALS['egw_setup']->add_acl('resources','run',$defaultgroup);
-	$GLOBALS['egw_setup']->add_acl('resources',"L$locations_cat_id",$defaultgroup,399);
+	$GLOBALS['egw_setup']->add_acl('resources',"l$locations_cat_id",$defaultgroup,399);
 
 	return $GLOBALS['setup_info']['resources']['currentver'] = '1.9.001';
 }

resources/setup/default_records.inc.php

Spacing +12 added lines, -12 removed lines

@@ -14,26 +14,26 @@ 
 $resources_table_prefix = 'egw_resources';
 
 // Add a general category for resources
-$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table,array('cat_parent' => 0, 'cat_owner' => Api\Categories::GLOBAL_ACCOUNT,'cat_access' => 'public','cat_appname' => 'resources','cat_name' => 'General resources','cat_description' => 'This category has been added by setup','last_mod' => time()),false,__LINE__,__FILE__);
-$cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table,'cat_id');
-$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table,array('cat_parent' => 0, 'cat_owner' => Api\Categories::GLOBAL_ACCOUNT,'cat_access' => 'public','cat_appname' => 'resources','cat_name' => 'Locations','cat_description' => 'This category has been added by setup','last_mod' => time()),false,__LINE__,__FILE__);
-$locations_cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table,'cat_id');
+$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table, array('cat_parent' => 0, 'cat_owner' => Api\Categories::GLOBAL_ACCOUNT, 'cat_access' => 'public', 'cat_appname' => 'resources', 'cat_name' => 'General resources', 'cat_description' => 'This category has been added by setup', 'last_mod' => time()), false, __LINE__, __FILE__);
+$cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table, 'cat_id');
+$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table, array('cat_parent' => 0, 'cat_owner' => Api\Categories::GLOBAL_ACCOUNT, 'cat_access' => 'public', 'cat_appname' => 'resources', 'cat_name' => 'Locations', 'cat_description' => 'This category has been added by setup', 'last_mod' => time()), false, __LINE__, __FILE__);
+$locations_cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table, 'cat_id');
 Api\Config::save_value('location_cats', $locations_cat_id, 'resources');
 
 // Give default group all rights to this general cat
-$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
-$GLOBALS['egw_setup']->add_acl('resources','run',$defaultgroup);
-$GLOBALS['egw_setup']->add_acl('resources',"L$cat_id",$defaultgroup,399);
-$GLOBALS['egw_setup']->add_acl('resources',"L$locations_cat_id",$defaultgroup,399);
+$defaultgroup = $GLOBALS['egw_setup']->add_account('Default', 'Default', 'Group', False, False);
+$GLOBALS['egw_setup']->add_acl('resources', 'run', $defaultgroup);
+$GLOBALS['egw_setup']->add_acl('resources', "L$cat_id", $defaultgroup, 399);
+$GLOBALS['egw_setup']->add_acl('resources', "L$locations_cat_id", $defaultgroup, 399);
 
 // Add two rooms to give user an idea of what resources is...
 $oProc->query("INSERT INTO {$resources_table_prefix} (name,cat_id,bookable,picture_src,accessory_of) VALUES ( 'Meeting room 1',$locations_cat_id,1,'cat_src',-1)");
 $oProc->query("INSERT INTO {$resources_table_prefix} (name,cat_id,bookable,picture_src,accessory_of) VALUES ( 'Meeting room 2',$locations_cat_id,1,'cat_src',-1)");
-$res_id = $oProc->m_odb->get_last_insert_id($resources_table_prefix,'res_id');
+$res_id = $oProc->m_odb->get_last_insert_id($resources_table_prefix, 'res_id');
 $oProc->query("INSERT INTO {$resources_table_prefix} (name,cat_id,bookable,picture_src,accessory_of) VALUES ( 'Fixed Beamer',$cat_id,0,'cat_src',$res_id)");
 
 // Turn on history by default
-foreach(array(
+foreach (array(
 	'history'     => 'history',
 ) as $name => $value)
 {
@@ -43,10 +43,10 @@ 
 			'config_app' => 'resources',
 			'config_name' => $name,
 			'config_value' => $value,
-		),array(
+		), array(
 			'config_app' => 'resources',
 			'config_name' => $name,
-		),__LINE__,__FILE__
+		), __LINE__, __FILE__
 	);
 }
 

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 // Give default group all rights to this general cat
 $defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
 $GLOBALS['egw_setup']->add_acl('resources','run',$defaultgroup);
-$GLOBALS['egw_setup']->add_acl('resources',"L$cat_id",$defaultgroup,399);
-$GLOBALS['egw_setup']->add_acl('resources',"L$locations_cat_id",$defaultgroup,399);
+$GLOBALS['egw_setup']->add_acl('resources',"l$cat_id",$defaultgroup,399);
+$GLOBALS['egw_setup']->add_acl('resources',"l$locations_cat_id",$defaultgroup,399);
 
 // Add two rooms to give user an idea of what resources is...
 $oProc->query("INSERT INTO {$resources_table_prefix} (name,cat_id,bookable,picture_src,accessory_of) VALUES ( 'Meeting room 1',$locations_cat_id,1,'cat_src',-1)");

resources/inc/class.resources_wizard_import_csv.inc.php

Indentation +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 			'long_description'      => lang('Long description'),
 			'inventory_number'      => lang('inventory number'),
 			'accessory_of'	=> lang('Accessory of')
-                );
+				);
 
 		$custom = Api\Storage\Customfields::get('resources', true);
 		foreach($custom as $name => $data) {

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
                 );
 
 		$custom = Api\Storage\Customfields::get('resources', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 

Braces +2 added lines, -1 removed lines

@@ -47,7 +47,8 @@
                 );
 
 		$custom = Api\Storage\Customfields::get('resources', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 

resources/inc/class.resources_export_csv.inc.php

Indentation +2 added lines, -2 removed lines

@@ -170,9 +170,9 @@
 	 * Get selectbox values
 	 */
 	protected function get_selects()
-        {
+		{
 		$this->selects = array();
-        }
+		}
 
 	/**
 	 * Customize automatically generated filter fields

Spacing +27 added lines, -27 removed lines

@@ -31,54 +31,54 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$selection = array();
 		if ($options['selection'] == 'search') {
 			// ui selection with checkbox 'selected'
 			$query = Api\Cache::getSession('resources', 'get_rows');
-			$query['num_rows'] = -1;	// all
+			$query['num_rows'] = -1; // all
 			unset($query['store_state']);
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$this->bo->get_rows($query,$selection,$readonlys);
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$this->bo->get_rows($query, $selection, $readonlys);
 		}
-		elseif ( $options['selection'] == 'all' || $options['selection'] == 'filter') {
+		elseif ($options['selection'] == 'all' || $options['selection'] == 'filter') {
 			$query = array(
 				'num_rows'	=> -1,
-				'filter2'	=> -3,  // Accessories & resources
-				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
-			);	// all
+				'filter2'	=> -3, // Accessories & resources
+				'csv_export' => true, // so get_rows method _can_ produce different content or not store state in the session
+			); // all
 			
-			if($options['selection'] == 'filter')
+			if ($options['selection'] == 'filter')
 			{
 				$filter = $_definition->filter;
 				// Handle ranges
-				foreach($filter as $field => $value)
+				foreach ($filter as $field => $value)
 				{
-					if($field == 'cat_id')
+					if ($field == 'cat_id')
 					{
 						$query['filter'] = $value;
 						continue;
 					}
-					if($field == 'filter2')
+					if ($field == 'filter2')
 					{
 						$query['filter2'] = $value;
 						continue;
 					}
 					$query['col_filter'][$field] = $value;
-					if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+					if (!is_array($value) || (!$value['from'] && !$value['to'])) continue;
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-					if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+					if ($value['from']) $query['col_filter'][] = "$field >= ".(int)$value['from'];
+					if ($value['to']) $query['col_filter'][] = "$field <= ".(int)$value['to'];
 					unset($query['col_filter'][$field]);
 				}
 			}
 			
-			$this->bo->get_rows($query,$selection,$readonlys);
+			$this->bo->get_rows($query, $selection, $readonlys);
 		} else {
-			$selection = explode(',',$options['selection']);
+			$selection = explode(',', $options['selection']);
 		}
 
 		$export_object = new importexport_export_csv($_stream, (array)$options);
@@ -86,28 +86,28 @@ 
 
 		// Check if we need to load the custom fields
 		$need_custom = false;
-		foreach(Api\Storage\Customfields::get('resources') as $field => $settings) {
-			if($options['mapping']['#'.$field]) {
+		foreach (Api\Storage\Customfields::get('resources') as $field => $settings) {
+			if ($options['mapping']['#'.$field]) {
 				$need_custom = true;
 				break;
 			}
 		}
 
 		foreach ($selection as $record) {
-			if(!is_array($record) || !$record['res_id']) continue;
+			if (!is_array($record) || !$record['res_id']) continue;
 
-			if($need_custom) {
+			if ($need_custom) {
 				$record = $this->bo->read($record['res_id']);
 			}
 			$resource = new resources_egw_record();
 			$resource->set_record($record);
 			$resource->long_description = strip_tags($resource->long_description);
-			if($options['convert']) {
+			if ($options['convert']) {
 				importexport_export_csv::convert($resource, resources_egw_record::$types, 'resources', $this->selects);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($resource->get_record_array() as $key => $value) {
-					if(is_array($value)) $resource->$key = implode(',', $value);
+				foreach ($resource->get_record_array() as $key => $value) {
+					if (is_array($value)) $resource->$key = implode(',', $value);
 				}
  			}
 
@@ -182,7 +182,7 @@ 
 		// In resources, not all categories are used
 		$filters['cat_id']['type'] = 'select';
 		$filters['cat_id']['name'] = 'filter';
-		$filters['cat_id']['values']= (array)$this->bo->acl->get_cats(Acl::READ);
+		$filters['cat_id']['values'] = (array)$this->bo->acl->get_cats(Acl::READ);
 
 		// Add in resources / accessories
 		$filters['filter2'] = array(
@@ -192,9 +192,9 @@ 
 			'rows' => 5,
 			'values' => resources_bo::$filter_options
 		);
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 	}
 

Braces +63 added lines, -25 removed lines

@@ -17,7 +17,8 @@ 
 /**
  * export resources to CSV
  */
-class resources_export_csv implements importexport_iface_export_plugin {
+class resources_export_csv implements importexport_iface_export_plugin
+{
 
 	public function __construct()
 	{
@@ -31,11 +32,13 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$selection = array();
-		if ($options['selection'] == 'search') {
+		if ($options['selection'] == 'search')
+		{
 			// ui selection with checkbox 'selected'
 			$query = Api\Cache::getSession('resources', 'get_rows');
 			$query['num_rows'] = -1;	// all
@@ -43,7 +46,8 @@ 
 			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
 			$this->bo->get_rows($query,$selection,$readonlys);
 		}
-		elseif ( $options['selection'] == 'all' || $options['selection'] == 'filter') {
+		elseif ( $options['selection'] == 'all' || $options['selection'] == 'filter')
+		{
 			$query = array(
 				'num_rows'	=> -1,
 				'filter2'	=> -3,  // Accessories & resources
@@ -67,17 +71,28 @@ 
 						continue;
 					}
 					$query['col_filter'][$field] = $value;
-					if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+					if(!is_array($value) || (!$value['from'] && !$value['to']))
+					{
+						continue;
+					}
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-					if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+					if($value['from'])
+					{
+						$query['col_filter'][] = "$field >= " . (int)$value['from'];
+					}
+					if($value['to'])
+					{
+						$query['col_filter'][] = "$field <= " . (int)$value['to'];
+					}
 					unset($query['col_filter'][$field]);
 				}
 			}
 			
 			$this->bo->get_rows($query,$selection,$readonlys);
-		} else {
+		}
+		else
+		{
 			$selection = explode(',',$options['selection']);
 		}
 
@@ -86,28 +101,42 @@ 
 
 		// Check if we need to load the custom fields
 		$need_custom = false;
-		foreach(Api\Storage\Customfields::get('resources') as $field => $settings) {
-			if($options['mapping']['#'.$field]) {
+		foreach(Api\Storage\Customfields::get('resources') as $field => $settings)
+		{
+			if($options['mapping']['#'.$field])
+			{
 				$need_custom = true;
 				break;
 			}
 		}
 
-		foreach ($selection as $record) {
-			if(!is_array($record) || !$record['res_id']) continue;
+		foreach ($selection as $record)
+		{
+			if(!is_array($record) || !$record['res_id'])
+			{
+				continue;
+			}
 
-			if($need_custom) {
+			if($need_custom)
+			{
 				$record = $this->bo->read($record['res_id']);
 			}
 			$resource = new resources_egw_record();
 			$resource->set_record($record);
 			$resource->long_description = strip_tags($resource->long_description);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($resource, resources_egw_record::$types, 'resources', $this->selects);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($resource->get_record_array() as $key => $value) {
-					if(is_array($value)) $resource->$key = implode(',', $value);
+				foreach($resource->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$resource->$key = implode(',', $value);
+					}
 				}
  			}
 
@@ -122,7 +151,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Resources CSV export');
 	}
 
@@ -131,7 +161,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports a list of resources to a CSV File.");
 	}
 
@@ -140,11 +171,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/csv';
 	}
 
@@ -153,14 +186,16 @@ 
 	 * this way the plugin has all opportunities for options tab
 	 *
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns selectors information
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'importexport.export_csv_selectors',
 		);
@@ -170,7 +205,7 @@ 
 	 * Get selectbox values
 	 */
 	protected function get_selects()
-        {
+	{
 		$this->selects = array();
         }
 
@@ -194,7 +229,10 @@ 
 		);
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 		}
 	}
 

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
 	/**
 	 * Customize automatically generated filter fields
 	 */
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
 	{
 		// In resources, not all categories are used
 		$filters['cat_id']['type'] = 'select';

Doc Comments +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;

resources/inc/class.resources_reserve.inc.php

Indentation +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 			} else {
 				$data['msg']= '<div class="confirm">'.lang('Unable to process confirmation.').'</div>';
 			}
-                }
+				}
 
 		$this->tmpl->read('resources.sitemgr_book');
 

Spacing +48 added lines, -48 removed lines

@@ -26,17 +26,17 @@ 
 	 */
 	public function book($content = array(), $arguments = array())
 	{
-		Framework::includeJS('jscalendar','calendar');
+		Framework::includeJS('jscalendar', 'calendar');
 		$data = array();
 		$readonlys = array();
 		$display_days = $_GET['planner_days'] ? $_GET['planner_days'] : 3;
-		$planner_date = $_GET['date'] ? $_GET['date'] : strtotime('yesterday',$content['date'] ? $content['date'] : time());
+		$planner_date = $_GET['date'] ? $_GET['date'] : strtotime('yesterday', $content['date'] ? $content['date'] : time());
 
-		if($_GET['confirm']) {
-			$register_code = ($_GET['confirm'] && preg_match('/^[0-9a-f]{32}$/',$_GET['confirm'])) ? $_GET['confirm'] : false;
-			if($register_code && $registration = registration_bo::confirm($register_code)) {
+		if ($_GET['confirm']) {
+			$register_code = ($_GET['confirm'] && preg_match('/^[0-9a-f]{32}$/', $_GET['confirm'])) ? $_GET['confirm'] : false;
+			if ($register_code && $registration = registration_bo::confirm($register_code)) {
 				// Get calendar through link
-				$links = Link::get_links('registration', $registration['reg_id'],'calendar');
+				$links = Link::get_links('registration', $registration['reg_id'], 'calendar');
 				$bo = new calendar_boupdate();
 				$data = $bo->read(current($links));
 
@@ -45,24 +45,24 @@ 
 
 				// Show date of reservation, so they can see it blocked off
 				$display_days = 1;
-				$planner_date = mktime(0,0,0,date('m',$data['start']),date('d',$data['start']),date('Y',$data['start']));
+				$planner_date = mktime(0, 0, 0, date('m', $data['start']), date('d', $data['start']), date('Y', $data['start']));
 				$readonlys['__ALL__'] = true;
 				$content = array(
 					'resource' => key($data['participant_types']['r']),
 					'date' => $data['start'],
-					'time' => $data['start'] - mktime(0,0,0,date('m',$data['start']),date('d',$data['start']),date('Y',$data['start'])),
+					'time' => $data['start'] - mktime(0, 0, 0, date('m', $data['start']), date('d', $data['start']), date('Y', $data['start'])),
 					'quantity' => 0
 				);
-				calendar_so::split_status($data['participant_types']['r'][$content['resource']], $content['quantity'],$role);
-				$data['msg']= '<div class="confirm">'.lang('Registration confirmed %1', Api\DateTime::to($data['start'])) .'</div>';
+				calendar_so::split_status($data['participant_types']['r'][$content['resource']], $content['quantity'], $role);
+				$data['msg'] = '<div class="confirm">'.lang('Registration confirmed %1', Api\DateTime::to($data['start'])).'</div>';
 			} else {
-				$data['msg']= '<div class="confirm">'.lang('Unable to process confirmation.').'</div>';
+				$data['msg'] = '<div class="confirm">'.lang('Unable to process confirmation.').'</div>';
 			}
                 }
 
 		$this->tmpl->read('resources.sitemgr_book');
 
-		if(!$arguments['resource'] && !($arguments['resource'] = $content['resource'])) return false;
+		if (!$arguments['resource'] && !($arguments['resource'] = $content['resource'])) return false;
 		$data += $this->bo->read($arguments['resource']);
 
 		$data['quantity'] = $content['quantity'] ? $content['quantity'] : 2;
@@ -81,11 +81,11 @@ 
 		$preserve['include_group'] = $arguments['include_group'] ? $arguments['include_group'] : $content['include_group'];
 
 		// Check for valid time
-		if($data['date'] && $content['book'])
+		if ($data['date'] && $content['book'])
 		{
-			$start_time = $data['date'] + (is_array($data['time']) ? $data['time']['hour']*3600 + $data['time']['minute']*60 : $data['time']);
+			$start_time = $data['date'] + (is_array($data['time']) ? $data['time']['hour'] * 3600 + $data['time']['minute'] * 60 : $data['time']);
 			// Use sitemgr's default appointment length
-			if($GLOBALS['egw_info']['user']['account_lid'] != $GLOBALS['sitemgr_info']['anonymous_user'])
+			if ($GLOBALS['egw_info']['user']['account_lid'] != $GLOBALS['sitemgr_info']['anonymous_user'])
 			{
 				$preferences = new Api\Preferences($GLOBALS['egw']->accounts->name2id($GLOBALS['sitemgr_info']['anonymous_user']));
 				$preferences = $preferences->read_repository();
@@ -100,21 +100,21 @@ 
 			$config = Api\Config::read('registration');
 
 			// Not a user, need contact
-			if($GLOBALS['egw_info']['user']['account_lid'] == $GLOBALS['sitemgr_info']['anonymous_user'] && !$content['contact_id'])
+			if ($GLOBALS['egw_info']['user']['account_lid'] == $GLOBALS['sitemgr_info']['anonymous_user'] && !$content['contact_id'])
 			{
 				if ($config['pending_addressbook'])   // save the contact in the addressbook
 				{
 					$content['owner'] = $config['pending_addressbook'];
-					$content['private'] = 0;        // in case default_private is set
+					$content['private'] = 0; // in case default_private is set
 				}
 
 				$addressbook = new Api\Contacts();
 				$contact_fields = $addressbook->contact_fields;
 				unset($contact_fields['email']); // Always present
 				unset($contact_fields['id']); // Address already there
-				if(array_intersect_key($contact_fields,$content)) {
+				if (array_intersect_key($contact_fields, $content)) {
 					$result = $addressbook->save($content);
-					if(!$result) {
+					if (!$result) {
 						throw new Api\Exception\NoPermission($addressbook->error);
 						return False;
 					}
@@ -130,7 +130,7 @@ 
 				$contact_id = $GLOBALS['egw_info']['user']['person_id'];
 			}
 
-			if($contact) {
+			if ($contact) {
 				// Make event
 				$event = array(
 					'title' =>	Link::title('addressbook', $contact_id),
@@ -141,7 +141,7 @@ 
 						$contact => calendar_so::combine_status('U', $data['quantity'], 'REQ-PARTICIPANT')
 					)
 				);
-				if($preserve['include_group'])
+				if ($preserve['include_group'])
 				{
 					$event['participants'][$preserve['include_group']] = calendar_so::combine_status('U', 1, 'REQ-PARTICIPANT');
 				}
@@ -150,21 +150,21 @@ 
 
 				// Show date of reservation, so they can see it blocked off
 				$display_days = 1;
-				$planner_date = mktime(0,0,0,date('m',$event['start']),date('d',$event['start']),date('Y',$event['start']));
+				$planner_date = mktime(0, 0, 0, date('m', $event['start']), date('d', $event['start']), date('Y', $event['start']));
 
 				// Free time search
-				if(!is_numeric($result))
+				if (!is_numeric($result))
 				{
 					$form = new calendar_uiforms();
 					$freetime = $form->freetime('r'.$data['res_id'],
-						strtotime($GLOBALS['egw_info']['user']['preferences']['calendar']['workdaystarts'] . ':00',$start_time),
-						strtotime($GLOBALS['egw_info']['user']['preferences']['calendar']['workdayends'] . ':00 ',$end_time),
+						strtotime($GLOBALS['egw_info']['user']['preferences']['calendar']['workdaystarts'].':00', $start_time),
+						strtotime($GLOBALS['egw_info']['user']['preferences']['calendar']['workdayends'].':00 ', $end_time),
 						$duration
 					);
 					$data += $content;
 					$data['msg'] = lang('Please choose a different time:')."\n";
-					foreach($freetime as $slot) {
-						$data['msg'] .= Api\DateTime::to($slot['start']) . ' - ' . Api\DateTime::to($slot['end'])."<br />\n";
+					foreach ($freetime as $slot) {
+						$data['msg'] .= Api\DateTime::to($slot['start']).' - '.Api\DateTime::to($slot['end'])."<br />\n";
 					}
 				}
 				elseif ($preserve['confirmation'] && $contact_id && $result)
@@ -176,7 +176,7 @@ 
 						'post_confirm_hook' => 'resources.resources_reserve.confirm',
 						'sitemgr_version' => $preserve['sitemgr_version']
 					), false);
-					if(is_numeric($reg_id))
+					if (is_numeric($reg_id))
 					{
 						// Link to event
 						Link::link('registration', $reg_id, 'calendar', $result);
@@ -185,10 +185,10 @@ 
 						// Send email
 						$email_info = $config + array(
 							'title' => $data['name'],
-							'subject' => $data['name'] . ' ' . Api\DateTime::to($start_time),
+							'subject' => $data['name'].' '.Api\DateTime::to($start_time),
 							'link' => $preserve['link'],
 						);
-						if($preserve['email_message'])
+						if ($preserve['email_message'])
 						{
 							$email_info['message'] = lang($preserve['email_message'],
 								Api\DateTime::to($start_time),
@@ -205,23 +205,23 @@ 
 		$data['picture'] = $this->bo->get_picture($data);
 
 		// Not a user, need contact
-		if($GLOBALS['egw_info']['user']['account_lid'] == $GLOBALS['sitemgr_info']['anonymous_user'] && !$content['contact_id'])
+		if ($GLOBALS['egw_info']['user']['account_lid'] == $GLOBALS['sitemgr_info']['anonymous_user'] && !$content['contact_id'])
 		{
 			$data['contact_form'] = $preserve['contact_form'];
 			$data['show_contact'] = !$preserve['contact_form'];
 		}
 
 		$cal_user = array('r'.$arguments['resource']);
-		foreach($this->bo->get_acc_list($data['res_id']) as $acc_id => $name)
+		foreach ($this->bo->get_acc_list($data['res_id']) as $acc_id => $name)
 		{
 			$cal_user[] = 'r'.$acc_id;
 		}
 
-		if(!$data['date']) $data['date'] = strtotime('tomorrow');
-		if(!$data['time']) $data['time']['hour'] = $GLOBALS['egw_info']['user']['preferences']['calendar']['workdaystarts'];
+		if (!$data['date']) $data['date'] = strtotime('tomorrow');
+		if (!$data['time']) $data['time']['hour'] = $GLOBALS['egw_info']['user']['preferences']['calendar']['workdaystarts'];
 
 		// Use sitemgr's default appointment length
-		if($GLOBALS['egw_info']['user']['account_lid'] != $GLOBALS['sitemgr_info']['anonymous_user'])
+		if ($GLOBALS['egw_info']['user']['account_lid'] != $GLOBALS['sitemgr_info']['anonymous_user'])
 		{
 			$preferences = new Api\Preferences($GLOBALS['egw']->accounts->name2id($GLOBALS['sitemgr_info']['anonymous_user']));
 			$preferences = $preferences->read_repository();
@@ -234,28 +234,28 @@ 
 		// Leading 0
 		$data['duration'] = '0'.$data['duration'];
 
-		if(!$GLOBALS['egw_info']['user']['apps']['resources'] || !$this->bo->get_calendar_info($data['res_id']) || // Needed for booking
+		if (!$GLOBALS['egw_info']['user']['apps']['resources'] || !$this->bo->get_calendar_info($data['res_id']) || // Needed for booking
 			!$GLOBALS['egw_info']['user']['apps']['calendar'] // Needed for updating schedule
 		)
 		{
-			$data['planner'] = 'Permission error - site not configured properly.  Need ' . lang('resources') . ' & ' . lang('calendar');
+			$data['planner'] = 'Permission error - site not configured properly.  Need '.lang('resources').' & '.lang('calendar');
 		}
 		else
 		{
 			$data['planner'] = $this->get_planner(
 				$arguments['resource'],
-				$planner_date ? $planner_date : strtotime('yesterday',$date), // Show day before, too
+				$planner_date ? $planner_date : strtotime('yesterday', $date), // Show day before, too
 				$display_days,
 				$preserve['link']
 			);
 		}
 
 		// Restrict times to working hours
-		for($i = $GLOBALS['egw_info']['user']['preferences']['calendar']['workdaystarts']; $i < $GLOBALS['egw_info']['user']['preferences']['calendar']['workdayends']; $i++)
+		for ($i = $GLOBALS['egw_info']['user']['preferences']['calendar']['workdaystarts']; $i < $GLOBALS['egw_info']['user']['preferences']['calendar']['workdayends']; $i++)
 		{
-			if($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '12')
+			if ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == '12')
 			{
-				$sel_options['hour'][$i] = ($i < '12' ? $i .' am' : ($i > 12 ? $i -12 : $i).' pm');
+				$sel_options['hour'][$i] = ($i < '12' ? $i.' am' : ($i > 12 ? $i - 12 : $i).' pm');
 			}
 			else
 			{
@@ -263,14 +263,14 @@ 
 			}
 		}
 
-		return $this->tmpl->exec('resources.resources_reserve.book',$data,$sel_options,$readonlys,$preserve);
+		return $this->tmpl->exec('resources.resources_reserve.book', $data, $sel_options, $readonlys, $preserve);
 	}
 
 	public function ajax_update_planner($resource_id, $date) {
 		$response = Api\Json\Response::get();
-		$response->assign('exec[planner_div]','innerHTML',$this->get_planner(
+		$response->assign('exec[planner_div]', 'innerHTML', $this->get_planner(
 			$resource_id,
-			strtotime('yesterday',$date),
+			strtotime('yesterday', $date),
 			3,
 			$_SERVER['HTTP_REFERER']
 		));
@@ -296,7 +296,7 @@ 
 		// Need to add this in explicitly, or it may be lost if use clicks a day
 		$calendar->search_params['users'][] = 'r'.$resource_id;
 		$calendar->search_params['users'][] = $GLOBALS['egw_info']['user']['account_id'];
-		$calendar->allowEdit = false;    // switches off all edit popups
+		$calendar->allowEdit = false; // switches off all edit popups
 
 		$planner = '<style type="text/css">'."\n".
 			'@import url('.$GLOBALS['egw_info']['server']['webserver_url'].'/calendar/templates/default/app.css'.");\n".
@@ -318,10 +318,10 @@ 
 	public function confirm($registration)
 	{
 		// Get calendar through link
-		$links = Link::get_links('registration', $registration['reg_id'],'calendar');
+		$links = Link::get_links('registration', $registration['reg_id'], 'calendar');
 		$bo = new calendar_boupdate();
 		$event = $bo->read(current($links));
-		if($registration['status'] == registration_bo::CONFIRMED)
+		if ($registration['status'] == registration_bo::CONFIRMED)
 		{
 			$bo->set_status(current($links), 'c'.$registration['contact_id'], 'A');
 		}
@@ -329,7 +329,7 @@ 
 		{
 			$bo->delete(current($links));
 			// Remove contact ID, or registration will try to purge the account
-			if($registration['account_id'])
+			if ($registration['account_id'])
 			{
 				unset($registration['contact_id']);
 			}

Braces +38 added lines, -16 removed lines

@@ -14,9 +14,11 @@ 
 use EGroupware\Api\Link;
 use EGroupware\Api\Framework;
 
-class resources_reserve {
+class resources_reserve
+{
 
-	public function __construct() {
+	public function __construct()
+	{
 		$this->tmpl = new etemplate();
 		$this->bo = new resources_bo();
 	}
@@ -32,9 +34,11 @@ 
 		$display_days = $_GET['planner_days'] ? $_GET['planner_days'] : 3;
 		$planner_date = $_GET['date'] ? $_GET['date'] : strtotime('yesterday',$content['date'] ? $content['date'] : time());
 
-		if($_GET['confirm']) {
+		if($_GET['confirm'])
+		{
 			$register_code = ($_GET['confirm'] && preg_match('/^[0-9a-f]{32}$/',$_GET['confirm'])) ? $_GET['confirm'] : false;
-			if($register_code && $registration = registration_bo::confirm($register_code)) {
+			if($register_code && $registration = registration_bo::confirm($register_code))
+			{
 				// Get calendar through link
 				$links = Link::get_links('registration', $registration['reg_id'],'calendar');
 				$bo = new calendar_boupdate();
@@ -55,14 +59,19 @@ 
 				);
 				calendar_so::split_status($data['participant_types']['r'][$content['resource']], $content['quantity'],$role);
 				$data['msg']= '<div class="confirm">'.lang('Registration confirmed %1', Api\DateTime::to($data['start'])) .'</div>';
-			} else {
+			}
+			else
+			{
 				$data['msg']= '<div class="confirm">'.lang('Unable to process confirmation.').'</div>';
 			}
                 }
 
 		$this->tmpl->read('resources.sitemgr_book');
 
-		if(!$arguments['resource'] && !($arguments['resource'] = $content['resource'])) return false;
+		if(!$arguments['resource'] && !($arguments['resource'] = $content['resource']))
+		{
+			return false;
+		}
 		$data += $this->bo->read($arguments['resource']);
 
 		$data['quantity'] = $content['quantity'] ? $content['quantity'] : 2;
@@ -102,9 +111,12 @@ 
 			// Not a user, need contact
 			if($GLOBALS['egw_info']['user']['account_lid'] == $GLOBALS['sitemgr_info']['anonymous_user'] && !$content['contact_id'])
 			{
-				if ($config['pending_addressbook'])   // save the contact in the addressbook
+				if ($config['pending_addressbook'])
+				{
+					// save the contact in the addressbook
 				{
 					$content['owner'] = $config['pending_addressbook'];
+				}
 					$content['private'] = 0;        // in case default_private is set
 				}
 
@@ -112,9 +124,11 @@ 
 				$contact_fields = $addressbook->contact_fields;
 				unset($contact_fields['email']); // Always present
 				unset($contact_fields['id']); // Address already there
-				if(array_intersect_key($contact_fields,$content)) {
+				if(array_intersect_key($contact_fields,$content))
+				{
 					$result = $addressbook->save($content);
-					if(!$result) {
+					if(!$result)
+					{
 						throw new Api\Exception\NoPermission($addressbook->error);
 						return False;
 					}
@@ -130,7 +144,8 @@ 
 				$contact_id = $GLOBALS['egw_info']['user']['person_id'];
 			}
 
-			if($contact) {
+			if($contact)
+			{
 				// Make event
 				$event = array(
 					'title' =>	Link::title('addressbook', $contact_id),
@@ -163,7 +178,8 @@ 
 					);
 					$data += $content;
 					$data['msg'] = lang('Please choose a different time:')."\n";
-					foreach($freetime as $slot) {
+					foreach($freetime as $slot)
+					{
 						$data['msg'] .= Api\DateTime::to($slot['start']) . ' - ' . Api\DateTime::to($slot['end'])."<br />\n";
 					}
 				}
@@ -217,8 +233,14 @@ 
 			$cal_user[] = 'r'.$acc_id;
 		}
 
-		if(!$data['date']) $data['date'] = strtotime('tomorrow');
-		if(!$data['time']) $data['time']['hour'] = $GLOBALS['egw_info']['user']['preferences']['calendar']['workdaystarts'];
+		if(!$data['date'])
+		{
+			$data['date'] = strtotime('tomorrow');
+		}
+		if(!$data['time'])
+		{
+			$data['time']['hour'] = $GLOBALS['egw_info']['user']['preferences']['calendar']['workdaystarts'];
+		}
 
 		// Use sitemgr's default appointment length
 		if($GLOBALS['egw_info']['user']['account_lid'] != $GLOBALS['sitemgr_info']['anonymous_user'])
@@ -236,8 +258,7 @@ 
 
 		if(!$GLOBALS['egw_info']['user']['apps']['resources'] || !$this->bo->get_calendar_info($data['res_id']) || // Needed for booking
 			!$GLOBALS['egw_info']['user']['apps']['calendar'] // Needed for updating schedule
-		)
-		{
+		) {
 			$data['planner'] = 'Permission error - site not configured properly.  Need ' . lang('resources') . ' & ' . lang('calendar');
 		}
 		else
@@ -266,7 +287,8 @@ 
 		return $this->tmpl->exec('resources.resources_reserve.book',$data,$sel_options,$readonlys,$preserve);
 	}
 
-	public function ajax_update_planner($resource_id, $date) {
+	public function ajax_update_planner($resource_id, $date)
+	{
 		$response = Api\Json\Response::get();
 		$response->assign('exec[planner_div]','innerHTML',$this->get_planner(
 			$resource_id,

resources/inc/class.resources_wizard_export_csv.inc.php

Spacing +6 added lines, -6 removed lines

@@ -26,26 +26,26 @@ 
 
 		// Custom fields
 		$custom = Api\Storage\Customfields::get('resources', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}
 
 	public function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv) {
-		if($this->debug || true) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		if ($this->debug || true) error_log(get_class($this).'::wizard_step50->$content '.print_r($content, true));
 		// return
 		if ($content['step'] == 'wizard_step50')
 		{
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step50($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step50($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step
@@ -57,7 +57,7 @@ 
 			unset ($preserv['button']);
 			$fields = array('pm_used_time', 'pm_planned_time', 'pm_replanned_time');
 			$sel_options = array_fill_keys($fields, array('h' => lang('hours'), 'd' => lang('days')));
-			foreach($fields as $field) {
+			foreach ($fields as $field) {
 				$content[$field] = $content[$field] ? $content[$field] : $content['plugin_options'][$field];
 			}
 		}

Braces +12 added lines, -5 removed lines

@@ -14,7 +14,8 @@ 
 
 class resources_wizard_export_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -26,13 +27,18 @@ 
 
 		// Custom fields
 		$custom = Api\Storage\Customfields::get('resources', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}
 
-	public function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv) {
-		if($this->debug || true) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+	public function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
+	{
+		if($this->debug || true)
+		{
+			error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		}
 		// return
 		if ($content['step'] == 'wizard_step50')
 		{
@@ -57,7 +63,8 @@ 
 			unset ($preserv['button']);
 			$fields = array('pm_used_time', 'pm_planned_time', 'pm_replanned_time');
 			$sel_options = array_fill_keys($fields, array('h' => lang('hours'), 'd' => lang('days')));
-			foreach($fields as $field) {
+			foreach($fields as $field)
+			{
 				$content[$field] = $content[$field] ? $content[$field] : $content['plugin_options'][$field];
 			}
 		}

resources/inc/class.resources_favorite_portlet.inc.php

Spacing +14 added lines, -14 removed lines

@@ -28,7 +28,7 @@ 
 		$context['appname'] = 'resources';
 
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
 		$this->context['template'] = 'resources.show.rows';
 		$this->nm_settings += array(
@@ -48,13 +48,13 @@ 
 		);
 	}
 
-	public function exec($id = null, Etemplate &$etemplate = null)
+	public function exec($id = null, Etemplate&$etemplate = null)
 	{
 		$ui = new resources_ui();
 
-		$this->context['sel_options']['filter']= array(''=>lang('all categories'))+(array)$ui->bo->acl->get_cats(Acl::READ);
+		$this->context['sel_options']['filter'] = array(''=>lang('all categories')) + (array)$ui->bo->acl->get_cats(Acl::READ);
 		$this->context['sel_options']['filter2'] = resources_bo::$filter_options;
-		if(!$content['nm']['filter2'])
+		if (!$content['nm']['filter2'])
 		{
 			$content['nm']['filter2'] = key(resources_bo::$filter_options);
 		}
@@ -92,28 +92,28 @@ 
 			if (!count($content['nm']['selected']) && !$content['nm']['select_all'])
 			{
 				$msg = lang('You need to select some entries first!');
-				Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+				Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 			}
 			else
 			{
 				$success = $failed = $action_msg = null;
-				if ($ui->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-					$success,$failed,$action_msg,'index',$msg))
+				if ($ui->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+					$success, $failed, $action_msg, 'index', $msg))
 				{
-					$msg .= lang('%1 resource(s) %2',$success,$action_msg);
+					$msg .= lang('%1 resource(s) %2', $success, $action_msg);
 
-					Api\Json\Response::get()->apply('egw.message',array($msg,'success'));
-					foreach($content['nm']['selected'] as &$id)
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'success'));
+					foreach ($content['nm']['selected'] as &$id)
 					{
 						$id = 'resources::'.$id;
 					}
 					// Directly request an update - this will get resources tab too
-					Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($content['nm']['selected']));
+					Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($content['nm']['selected']));
 				}
-				elseif(empty($msg))
+				elseif (empty($msg))
 				{
-					$msg .= lang('%1 resource(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+					$msg .= lang('%1 resource(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 				}
 			}
 		}

Braces +4 added lines, -1 removed lines

@@ -76,9 +76,12 @@
 
 		// This is just copy+pasted from resources_ui line 816, but we don't want
 		// the etemplate exec to fire again.
-		if (is_array($content) && isset($content['nm']['rows']['document']))  // handle insert in default document button like an action
+		if (is_array($content) && isset($content['nm']['rows']['document']))
+		{
+			// handle insert in default document button like an action
 		{
 			list($id) = @each($content['nm']['rows']['document']);
+		}
 			$content['nm']['action'] = 'document';
 			$content['nm']['selected'] = array($id);
 		}

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	 * Construct the portlet
 	 *
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		$context['appname'] = 'resources';
 

resources/inc/class.resources_tracking.inc.php

Indentation +14 added lines, -14 removed lines

@@ -26,20 +26,20 @@
 		$this->id_field = 'res_id';
 
 		$this->field2history = array(
-                        'res_id'        => 'res_id',
-                        'name'          => 'name',
-                        'short_description'     => 'short_description',
-                        'cat_id'        => 'cat_id',
-                        'quantity'      => 'quantity',
-                        'useable'       => 'useable',
-                        'location'      => 'location',
-                        'storage_info'  => 'storage_info',
-                        'bookable'      => 'bookable',
-                        'buyable'       => 'buyable',
-                        'prize'         => 'prize',
-                        'long_description'      => 'long_description',
-                        'inventory_number'      => 'inventory_number',
-                        'accessory_of'  => 'accessory_of'
+						'res_id'        => 'res_id',
+						'name'          => 'name',
+						'short_description'     => 'short_description',
+						'cat_id'        => 'cat_id',
+						'quantity'      => 'quantity',
+						'useable'       => 'useable',
+						'location'      => 'location',
+						'storage_info'  => 'storage_info',
+						'bookable'      => 'bookable',
+						'buyable'       => 'buyable',
+						'prize'         => 'prize',
+						'long_description'      => 'long_description',
+						'inventory_number'      => 'inventory_number',
+						'accessory_of'  => 'accessory_of'
 		);
 		parent::__construct($this->appname);
 	}

Braces +2 added lines, -1 removed lines

@@ -21,7 +21,8 @@
 {
 
 	
-	public function __construct() {
+	public function __construct()
+	{
 		$this->appname = 'resources';
 		$this->id_field = 'res_id';