EGroupware / egroupware

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_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_acl_ui.inc.php

Spacing +37 added lines, -37 removed lines

@@ -50,30 +50,30 @@ 
 	 */
 	public function index($content = array())
 	{
-		if (!$GLOBALS['egw']->acl->check('run',1,'admin'))
+		if (!$GLOBALS['egw']->acl->check('run', 1, 'admin'))
 		{
 			$this->deny();
 		}
 
 		$content['nm'] = array(
-			'get_rows'      =>	'resources.resources_acl_ui.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+			'get_rows'      =>	'resources.resources_acl_ui.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
 			'no_search'      => True,
-			'no_filter'      => True,        // I  disable the 1. filter
-			'no_filter2'     => True,        // I  disable the 2. filter (params are the same as for filter)
-			'no_cat'         => True,        // I  disable the cat-selectbox
-			'row_id'         => 'id',    // I  key into row content to set it's value as row-id, eg. 'id'
-			'parent_id'      =>	'parent',// I  key into row content of children linking them to their parent, also used as col_filter to query children
-			'dataStorePrefix'=> 'categories',// Avoid conflict with user list when in admin
-			'actions'        => $this->get_actions(),    // I  array with actions, see nextmatch_widget::egw_actions
+			'no_filter'      => True, // I  disable the 1. filter
+			'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+			'no_cat'         => True, // I  disable the cat-selectbox
+			'row_id'         => 'id', // I  key into row content to set it's value as row-id, eg. 'id'
+			'parent_id'      =>	'parent', // I  key into row content of children linking them to their parent, also used as col_filter to query children
+			'dataStorePrefix'=> 'categories', // Avoid conflict with user list when in admin
+			'actions'        => $this->get_actions(), // I  array with actions, see nextmatch_widget::egw_actions
 			'placeholder_actions' => array('add')    //  I Array Optional list of actions allowed on the placeholder.  If not provided, it's ["add"].
 		);
 		$template = new Etemplate('resources.acl');
-		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['resources']['title'] . ' - ' . lang('Configure Access Permissions');
+		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['resources']['title'].' - '.lang('Configure Access Permissions');
 
 		$template->exec(__METHOD__, $content, $sel_options, $readonlys);
 	}
 	
-	protected function get_actions($appname='resources') {
+	protected function get_actions($appname = 'resources') {
 
 		$actions = array(
 			'open' => array(        // does edit if allowed, otherwise view
@@ -82,7 +82,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=resources.resources_acl_ui.edit&cat_id=$id',
 				'popup' => '600x420',
-				'group' => $group=1,
+				'group' => $group = 1,
 			),
 			'add' => array(
 				'caption' => 'Add',
@@ -105,42 +105,42 @@ 
 	 * @param array &$readonlys eg. to disable buttons based on Acl, not use here, maybe in a derived class
 	 * @return int total number of rows
 	 */
-	public function get_rows(&$query,&$rows,&$readonlys)
+	public function get_rows(&$query, &$rows, &$readonlys)
 	{
 
-		Api\Cache::setSession('resources','acl-nm',$query);
+		Api\Cache::setSession('resources', 'acl-nm', $query);
 
-		if($query['filter'] > 0 || $query['col_filter']['owner'])
+		if ($query['filter'] > 0 || $query['col_filter']['owner'])
 		{
 			$owner = $query['col_filter']['owner'] ? $query['col_filter']['owner'] : $query['filter'];
 		}
 
-		$cats = new Api\Categories($owner,'resources');
+		$cats = new Api\Categories($owner, 'resources');
 		$parent = $query['search'] ? false : 0;
-		$rows = $cats->return_sorted_array($query['start'],false,$query['search'],$query['sort'],$query['order'],'all_no_acl',$parent,true,$filter);
+		$rows = $cats->return_sorted_array($query['start'], false, $query['search'], $query['sort'], $query['order'], 'all_no_acl', $parent, true, $filter);
 		$count = $cats->total_records;
 
 
 		$config = Api\Config::read('resources');
 		$location_cats = $config['location_cats'] ? explode(',', $config['location_cats']) : array();
 
-		foreach($rows as $key => &$row)
+		foreach ($rows as $key => &$row)
 		{
-			$row['owner'] = explode(',',$row['owner']);
+			$row['owner'] = explode(',', $row['owner']);
 
-			$row['level_spacer'] = str_repeat('    ',$row['level']);
+			$row['level_spacer'] = str_repeat('    ', $row['level']);
 			$row['location'] = (in_array($row['id'], $location_cats));
 
 			if ($row['data']['icon'])
 			{
-				$row['icon_url'] = $GLOBALS['egw_info']['server']['webserver_url'].  resources_bo::ICON_PATH.'/'.$row['data']['icon'];
+				$row['icon_url'] = $GLOBALS['egw_info']['server']['webserver_url'].resources_bo::ICON_PATH.'/'.$row['data']['icon'];
 			}
 			
 			$row['subs'] = count($row['children']);
 
 			$row['class'] = 'level'.$row['level'];
 
-			foreach(self::$acl_map  as $field => $acl)
+			foreach (self::$acl_map  as $field => $acl)
 			{
 				$row[$field] = $GLOBALS['egw']->acl->get_ids_for_location('L'.$row['id'], $acl, 'resources');
 			}
@@ -157,9 +157,9 @@ 
 	 * @param array $content = null
 	 * @param string $msg = ''
 	 */
-	public function edit(array $content=null,$msg='')
+	public function edit(array $content = null, $msg = '')
 	{
-		if (!$GLOBALS['egw']->acl->check('run',1,'admin'))
+		if (!$GLOBALS['egw']->acl->check('run', 1, 'admin'))
 		{
 			$this->deny();
 		}
@@ -173,23 +173,23 @@ 
 		}
 		elseif ($content['button'])
 		{
-			$cats = new Categories($content['owner'] ? $content['owner'] : Categories::GLOBAL_ACCOUNT,'resources');
+			$cats = new Categories($content['owner'] ? $content['owner'] : Categories::GLOBAL_ACCOUNT, 'resources');
 
 			list($button) = each($content['button']);
 			unset($content['button']);
 
 			$refresh_app = 'admin';
 
-			switch($button)
+			switch ($button)
 			{
 				case 'save':
 				case 'apply':
-					if(is_array($content['owner'])) $content['owner'] = implode(',',$content['owner']);
-					if($content['owner'] == '') $content['owner'] = 0;
+					if (is_array($content['owner'])) $content['owner'] = implode(',', $content['owner']);
+					if ($content['owner'] == '') $content['owner'] = 0;
 					if ($content['id'])
 					{
 
-						$data = $cats->id2name($content['id'],'data');
+						$data = $cats->id2name($content['id'], 'data');
 						try {
 							$cats->edit($content);
 							resources_acl_bo::set_rights(
@@ -199,7 +199,7 @@ 
 						}
 						catch (Api\Exception\WrongUserinput $e)
 						{
-							$msg = lang('Unwilling to save category with current settings. Check for inconsistency:').$e->getMessage();	// display conflicts etc.
+							$msg = lang('Unwilling to save category with current settings. Check for inconsistency:').$e->getMessage(); // display conflicts etc.
 						}
 					}
 					else
@@ -219,32 +219,32 @@ 
 		}
 
 		$content['appname'] = 'resources';
-		if($content['data']['icon'])
+		if ($content['data']['icon'])
 		{
-			$content['icon_url'] = $content['base_url'] . $content['data']['icon'];
+			$content['icon_url'] = $content['base_url'].$content['data']['icon'];
 		}
 
 		// Make sure $content['owner'] is an array otherwise it wont show up values in the multiselectbox
-		if($content['owner'] == 0)
+		if ($content['owner'] == 0)
 		{
 			unset($content['owner']);
 		}
 		else if (!is_array($content['owner']))
 		{
-			$content['owner'] = explode(',',$content['owner']);
+			$content['owner'] = explode(',', $content['owner']);
 		}
 
-		foreach(self::$acl_map as $field => $acl)
+		foreach (self::$acl_map as $field => $acl)
 		{
 			$content[$field] = $GLOBALS['egw']->acl->get_ids_for_location('L'.$content['id'], $acl, 'resources');
 		}
 
 		// Location
 		$config = Api\Config::read('resources');
-		$content['location'] = in_array($content['id'],$config['location_cats'] ? explode(',', $config['location_cats']) : array());
+		$content['location'] = in_array($content['id'], $config['location_cats'] ? explode(',', $config['location_cats']) : array());
 
 		$tmpl = new Etemplate('resources.acl_edit');
-		$tmpl->exec('resources.resources_acl_ui.edit',$content,$sel_options,$readonlys,$content,2);
+		$tmpl->exec('resources.resources_acl_ui.edit', $content, $sel_options, $readonlys, $content, 2);
 	}
 
 	function deny()

Braces +10 added lines, -3 removed lines

@@ -73,7 +73,8 @@ 
 		$template->exec(__METHOD__, $content, $sel_options, $readonlys);
 	}
 	
-	protected function get_actions($appname='resources') {
+	protected function get_actions($appname='resources')
+	{
 
 		$actions = array(
 			'open' => array(        // does edit if allowed, otherwise view
@@ -184,8 +185,14 @@ 
 			{
 				case 'save':
 				case 'apply':
-					if(is_array($content['owner'])) $content['owner'] = implode(',',$content['owner']);
-					if($content['owner'] == '') $content['owner'] = 0;
+					if(is_array($content['owner']))
+					{
+						$content['owner'] = implode(',',$content['owner']);
+					}
+					if($content['owner'] == '')
+					{
+						$content['owner'] = 0;
+					}
 					if ($content['id'])
 					{
 

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

@@ -49,7 +49,7 @@
 	 *
 	 * @param boolean $need_reload Flag to indicate that the portlet needs to be reloaded (exec will be called)
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();
 

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';
 

resources/inc/class.resources_ui.inc.php

Spacing +91 added lines, -92 removed lines

@@ -37,8 +37,8 @@ 
 	function __construct()
 	{
 // 		print_r($GLOBALS['egw_info']); die();
-		$this->tmpl	= new Etemplate('resources.show');
-		$this->bo	= new resources_bo();
+		$this->tmpl = new Etemplate('resources.show');
+		$this->bo = new resources_bo();
 // 		$this->calui	= CreateObject('resources.ui_calviews');
 	}
 
@@ -49,7 +49,7 @@ 
 	 * @param array $content content from eTemplate callback
 	 *
 	 */
-	function index($content='')
+	function index($content = '')
 	{
 		if (is_array($content))
 		{
@@ -59,25 +59,25 @@ 
 
 			if (isset($content['btn_delete_selected']))
 			{
-				foreach($content['nm']['rows'] as $row)
+				foreach ($content['nm']['rows'] as $row)
 				{
-					if($res_id = $row['checkbox'][0])
+					if ($res_id = $row['checkbox'][0])
 					{
-						$msg .= '<p>'. $this->bo->delete($res_id). '</p><br>';
+						$msg .= '<p>'.$this->bo->delete($res_id).'</p><br>';
 					}
 				}
 				return $this->index($msg);
 			}
-			foreach($content['nm']['rows'] as $row)
+			foreach ($content['nm']['rows'] as $row)
 			{
-				if(isset($row['delete']))
+				if (isset($row['delete']))
 				{
-					$res_id = array_search('pressed',$row['delete']);
+					$res_id = array_search('pressed', $row['delete']);
 					return $this->index($this->bo->delete($res_id));
 				}
-				if(isset($row['view_acc']))
+				if (isset($row['view_acc']))
 				{
-					$sessiondata['filter2'] = array_search('pressed',$row['view_acc']);
+					$sessiondata['filter2'] = array_search('pressed', $row['view_acc']);
 					Api\Cache::setSession('resources', 'index_nm', $sessiondata);
 					return $this->index();
 				}
@@ -90,18 +90,18 @@ 
 				}
 				else
 				{
-					if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-						$success,$failed,$action_msg,'resources_index_nm',$msg))
+					if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+						$success, $failed, $action_msg, 'resources_index_nm', $msg))
 					{
-						$msg .= lang('%1 resource(s) %2',$success,$action_msg);
+						$msg .= lang('%1 resource(s) %2', $success, $action_msg);
 					}
-					elseif(empty($msg))
+					elseif (empty($msg))
 					{
-						$msg .= lang('%1 resource(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+						$msg .= lang('%1 resource(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 					}
 					else
 					{
-						$msg .= lang('%1 resource(s) %2, %3 failed',$success,$action_msg,$failed);
+						$msg .= lang('%1 resource(s) %2, %3 failed', $success, $action_msg, $failed);
 					}
 				}
 			}
@@ -111,65 +111,65 @@ 
 		$content = array();
 		$content['msg'] = $msg ? $msg : $_GET['msg'];
 
-		$content['nm']['get_rows']		= 'resources.resources_bo.get_rows';
+		$content['nm']['get_rows'] = 'resources.resources_bo.get_rows';
 		$content['nm']['no_filter'] 	= False;
 		$content['nm']['filter_no_lang'] = true;
 		$content['nm']['no_cat']	= true;
 		$content['nm']['bottom_too']	= true;
 		$content['nm']['order']		= 'name';
-		$content['nm']['sort']		= 'ASC';
-		$content['nm']['store_state']	= 'get_rows';
+		$content['nm']['sort'] = 'ASC';
+		$content['nm']['store_state'] = 'get_rows';
 		$content['nm']['row_id']	= 'res_id';
 		$content['nm']['favorites'] = true;
 
 		$nm_session_data = Api\Cache::getSession('resources', 'index_nm');
-		if($nm_session_data)
+		if ($nm_session_data)
 		{
 			$content['nm'] = $nm_session_data;
 		}
-		$content['nm']['options-filter']= array(''=>lang('all categories'))+(array)$this->bo->acl->get_cats(Acl::READ);
+		$content['nm']['options-filter'] = array(''=>lang('all categories')) + (array)$this->bo->acl->get_cats(Acl::READ);
 		$content['nm']['options-filter2'] = resources_bo::$filter_options;
-		if(!$content['nm']['filter2'])
+		if (!$content['nm']['filter2'])
 		{
 			$content['nm']['filter2'] = key(resources_bo::$filter_options);
 		}
 
 		$config = Api\Config::read('resources');
-		if($config['history'])
+		if ($config['history'])
 		{
 			$content['nm']['options-filter2'][resources_bo::DELETED] = lang('Deleted');
 		}
 
-		if($_GET['search']) {
+		if ($_GET['search']) {
 			$content['nm']['search'] = $_GET['search'];
 		}
-		if($_GET['view_accs_of'])
+		if ($_GET['view_accs_of'])
 		{
 			$content['nm']['filter2'] = (int)$_GET['view_accs_of'];
 		}
-		$content['nm']['actions']	= $this->get_actions();
+		$content['nm']['actions'] = $this->get_actions();
 		$content['nm']['placeholder_actions'] = array('add');
 
 		// check if user is permitted to add resources
 		// If they can't read any categories, they won't be able to save it
-		if(!$this->bo->acl->get_cats(Acl::ADD) || !$this->bo->acl->get_cats(Acl::READ))
+		if (!$this->bo->acl->get_cats(Acl::ADD) || !$this->bo->acl->get_cats(Acl::READ))
 		{
 			$no_button['add'] = $no_button['nm']['add'] = true;
 		}
 		$no_button['back'] = true;
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('resources');
 
-		Framework::includeJS('.','resources','resources');
+		Framework::includeJS('.', 'resources', 'resources');
 
-		if($content['nm']['filter2'] > 0)
+		if ($content['nm']['filter2'] > 0)
 		{
 			$master = $this->bo->so->read(array('res_id' => $content['nm']['filter2']));
 			$content['nm']['options-filter2'] = resources_bo::$filter_options + array(
-				$master['res_id'] => lang('accessories of') . ' ' . $master['name']
+				$master['res_id'] => lang('accessories of').' '.$master['name']
 			);
-			$content['nm']['get_rows'] 	= 'resources.resources_bo.get_rows';
-			$GLOBALS['egw_info']['flags']['app_header'] = lang('resources') . ' - ' . lang('accessories of '). ' '. $master['name'] .
-				($master['short_description'] ? ' [' . $master['short_description'] . ']' : '');
+			$content['nm']['get_rows'] = 'resources.resources_bo.get_rows';
+			$GLOBALS['egw_info']['flags']['app_header'] = lang('resources').' - '.lang('accessories of ').' '.$master['name'].
+				($master['short_description'] ? ' ['.$master['short_description'].']' : '');
 		}
 		$preserv = $content;
 
@@ -177,7 +177,7 @@ 
 
 		Api\Cache::setSession('resources', 'index_nm', $content['nm']);
 		$this->tmpl->read('resources.show');
-		return $this->tmpl->exec('resources.resources_ui.index',$content,$sel_options,$no_button,$preserv);
+		return $this->tmpl->exec('resources.resources_ui.index', $content, $sel_options, $no_button, $preserv);
 	}
 
 	/**
@@ -194,7 +194,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=resources.resources_ui.edit&res_id=$id',
 				'popup' => Link::get_registry('resources', 'add_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'rowNoEdit',
 			),
 			'add' => array(
@@ -276,7 +276,7 @@ 
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)
+	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg)
 	{
 		$success = $failed = 0;
 		if ($use_all)
@@ -284,11 +284,11 @@ 
 			// get the whole selection
 			$query = is_array($session_name) ? $session_name : $GLOBALS['egw']->session->appsession('session_data', $session_name);
 
-			@set_time_limit(0);                     // switch off the execution time limit, as it's for big selections to small
-			$query['num_rows'] = -1;        // all
-			$this->bo->get_rows($query,$resources,$readonlys);
+			@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+			$query['num_rows'] = -1; // all
+			$this->bo->get_rows($query, $resources, $readonlys);
 			$checked = array();
-			foreach($resources as $resource)
+			foreach ($resources as $resource)
 			{
 				$checked[] = $resource['res_id'];
 			}
@@ -298,17 +298,17 @@ 
 		// Dialogs to get options
 		list($action, $settings) = explode('_', $action, 2);
 
-		switch($action)
+		switch ($action)
 		{
 			case 'restore':
 				$action_msg = lang('restored');
-				foreach($checked as $n=>$id)
+				foreach ($checked as $n=>$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if (!$id) continue;
 					$resource = $this->bo->read($id);
 					$resource['deleted'] = null;
-					if($resource['accessory_of'] > 0)
+					if ($resource['accessory_of'] > 0)
 					{
 						/*
 						If restoring an accessory, and parent is deleted, and not in
@@ -316,18 +316,18 @@ 
 						*/
 						$parent = $this->bo->read($resource['accessory_of']);
 						$checked_key = array_search($parent['res_id'], $checked);
-						if($checked_key === false && $parent['deleted'])
+						if ($checked_key === false && $parent['deleted'])
 						{
 							$resource['accessory_of'] = -1;
 						}
 					}
 
 					$this->bo->save($resource);
-					if($settings == 'accessories')
+					if ($settings == 'accessories')
 					{
 						// Restore accessories too
-						$accessories = $this->bo->get_acc_list($id,true);
-						foreach($accessories as $acc_id => $name)
+						$accessories = $this->bo->get_acc_list($id, true);
+						foreach ($accessories as $acc_id => $name)
 						{
 							$acc = $this->bo->read($acc_id);
 							$acc['deleted'] = null;
@@ -337,20 +337,20 @@ 
 					}
 					$success++;
 				}
-				if($restored_accessories) $action_msg .= ", " . lang('%1 accessories restored',$restored_accessories);
+				if ($restored_accessories) $action_msg .= ", ".lang('%1 accessories restored', $restored_accessories);
 				break;
 			case 'delete':
 				$action_msg = lang('deleted');
 				$promoted_accessories = 0;
-				foreach($checked as $n => &$id)
+				foreach ($checked as $n => &$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if (!$id) continue;
 					$resource = $this->bo->read($id);
-					if($settings == 'promote')
+					if ($settings == 'promote')
 					{
 						// Handle a selected accessory
-						if($resource['accessory_of'] > 0)
+						if ($resource['accessory_of'] > 0)
 						{
 							$resource['accessory_of'] = -1;
 							$this->bo->save($resource);
@@ -359,8 +359,8 @@ 
 						}
 
 						// Make associated accessories into resources - include deleted
-						$accessories = $this->bo->get_acc_list($id,true);
-						foreach($accessories as $acc_id => $name)
+						$accessories = $this->bo->get_acc_list($id, true);
+						foreach ($accessories as $acc_id => $name)
 						{
 							$acc = $this->bo->read($acc_id);
 							$acc['accessory_of'] = -1;
@@ -371,19 +371,19 @@ 
 
 							// Don't need to process these ones now
 							$checked_key = array_search($acc_id, $checked);
-							if($checked_key !== false) unset($checked[$checked_key]);
+							if ($checked_key !== false) unset($checked[$checked_key]);
 						}
 					}
 					else
 					{
 						// Remove checked accessories, deleting resource will remove them
 						// We get an error if we try to delete them after they're gone
-						$accessories = $this->bo->get_acc_list($id,$resource['deleted']);
+						$accessories = $this->bo->get_acc_list($id, $resource['deleted']);
 
-						foreach($accessories as $acc_id => $name)
+						foreach ($accessories as $acc_id => $name)
 						{
 							$checked_key = array_search($acc_id, $checked);
-							if($checked_key !== false)
+							if ($checked_key !== false)
 							{
 								$success++;
 								unset($checked[$checked_key]);
@@ -397,11 +397,11 @@ 
 					}
 					else
 					{
-						$msg = $error . "\n";
+						$msg = $error."\n";
 						$failed++;
 					}
 				}
-				if($promoted_accessories) $action_msg .= ", " . lang('%1 accessories now resources',$promoted_accessories);
+				if ($promoted_accessories) $action_msg .= ", ".lang('%1 accessories now resources', $promoted_accessories);
 				break;
 		}
 		return $failed == 0;
@@ -413,13 +413,13 @@ 
 	 *
 	 * @param $content   Content from the eTemplate Exec call or id on inital call
 	 */
-	function edit($content=0,$accessory_of = -1)
+	function edit($content = 0, $accessory_of = -1)
 	{
 		if (is_array($content))
 		{
 			list($button) = @each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'save':
 				case 'apply':
@@ -430,20 +430,20 @@ 
 // 						// links are already saved by eTemplate
 // 						unset($resource['link_to']['to_id']);
 // 					}
-					if($content['res_id'])
+					if ($content['res_id'])
 					{
 						 $acc_count = count($this->bo->get_acc_list($content['res_id']));
 					}
 					$result = $this->bo->save($content);
 
-					if(is_numeric($result))
+					if (is_numeric($result))
 					{
-						$msg = lang('Resource %1 saved!',$result);
+						$msg = lang('Resource %1 saved!', $result);
 						$content['res_id'] = $result;
-						if($acc_count && $content['accessory_of'] != -1)
+						if ($acc_count && $content['accessory_of'] != -1)
 						{
 							// Resource with accessories changed into accessory
-							if($acc_count) $msg = lang('%1 accessories now resources',$acc_count);
+							if ($acc_count) $msg = lang('%1 accessories now resources', $acc_count);
 						}
 					}
 					else
@@ -454,9 +454,9 @@ 
 					break;
 				case 'delete':
 					unset($content['delete']);
-					if(!$this->bo->delete($content['res_id']))
+					if (!$this->bo->delete($content['res_id']))
 					{
-						$msg = lang('Resource %1 deleted!',$content['res_id']);
+						$msg = lang('Resource %1 deleted!', $content['res_id']);
 					}
 					else
 					{
@@ -464,9 +464,9 @@ 
 						break;
 					}
 			}
-			Framework::refresh_opener($msg, 'resources',$content['res_id'],($button == 'delete'?'delete':'edit'));
+			Framework::refresh_opener($msg, 'resources', $content['res_id'], ($button == 'delete' ? 'delete' : 'edit'));
 
-			if($button != 'apply')
+			if ($button != 'apply')
 			{
 				Framework::window_close();
 			}
@@ -482,7 +482,7 @@ 
 		if ($res_id > 0)
 		{
 			$content = $this->bo->read($res_id);
-			$content['picture_src'] = strpos($content['picture_src'],'.') !== false ? 'gen_src' : $content['picture_src'];
+			$content['picture_src'] = strpos($content['picture_src'], '.') !== false ? 'gen_src' : $content['picture_src'];
 			$content['link_to'] = array(
 				'to_id' => $res_id,
 				'to_app' => 'resources'
@@ -490,7 +490,7 @@ 
 		} elseif ($accessory_of > 0) {
 			// Pre-set according to parent
 			$owner = $this->bo->read($accessory_of);
-			if($owner['accessory_of'] > 0)
+			if ($owner['accessory_of'] > 0)
 			{
 				// Accessory of accessory not allowed, grab parent resource
 				$accessory_of = $owner['accessory_of'];
@@ -503,33 +503,32 @@ 
 			$content['cat_id'] = $nm_session_data['filter'];
 			$content['bookable'] = true;
 		}
-		if($msg) {
+		if ($msg) {
 			$content['msg'] = $msg;
 		}
 
 		if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);
 
 		// some presetes
-		$content['resource_picture'] = $this->bo->get_picture($content['res_id'],false);
+		$content['resource_picture'] = $this->bo->get_picture($content['res_id'], false);
 		// Set original size picture
-		$content['picture_original'] = $content['picture_src'] == 'own_src'?
-				'webdav.php/apps/resources/'.$content['res_id'].'/.picture.jpg': $this->bo->get_picture($content['res_id'],true);
+		$content['picture_original'] = $content['picture_src'] == 'own_src' ?
+				'webdav.php/apps/resources/'.$content['res_id'].'/.picture.jpg' : $this->bo->get_picture($content['res_id'], true);
 
 		$content['quantity'] = $content['quantity'] ? $content['quantity'] : 1;
 		$content['useable'] = $content['useable'] ? $content['useable'] : 1;
 		$content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of;
 
-		if($content['res_id'] && $content['accessory_of'] == -1)
+		if ($content['res_id'] && $content['accessory_of'] == -1)
 		{
 			$content['acc_count'] = count($this->bo->get_acc_list($content['res_id']));
 		}
 		$sel_options['status'] = resources_bo::$field2label;
 
 		//$sel_options['gen_src_list'] = $this->bo->get_genpicturelist();
-		$sel_options['cat_id'] =  $this->bo->acl->get_cats(Acl::ADD);
-		$sel_options['cat_id'] = count($sel_options['cat_id']) == 1 ? $sel_options['cat_id'] :
-			array('' => lang('select one')) + $sel_options['cat_id'];
-		if($accessory_of > 0 || $content['accessory_of'] > 0)
+		$sel_options['cat_id'] = $this->bo->acl->get_cats(Acl::ADD);
+		$sel_options['cat_id'] = count($sel_options['cat_id']) == 1 ? $sel_options['cat_id'] : array('' => lang('select one')) + $sel_options['cat_id'];
+		if ($accessory_of > 0 || $content['accessory_of'] > 0)
 		{
 			$content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of;
 		}
@@ -544,19 +543,19 @@ 
 			)
 		);
 
-		$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('',$search_options);
-		if($res_id) unset($sel_options['accessory_of'][$res_id]);
+		$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('', $search_options);
+		if ($res_id) unset($sel_options['accessory_of'][$res_id]);
 
 // 		$content['general|page|pictures|links'] = 'resources.edit_tabs.page';  //debug
 
 		// Permissions
 		$read_only = array();
-		if($res_id && !$this->bo->acl->is_permitted($content['cat_id'],Acl::EDIT))
+		if ($res_id && !$this->bo->acl->is_permitted($content['cat_id'], Acl::EDIT))
 		{
 			$read_only['__ALL__'] = true;
 		}
 		$config = Api\Config::read('resources');
-		if(!$this->bo->acl->is_permitted($content['cat_id'],Acl::DELETE) ||
+		if (!$this->bo->acl->is_permitted($content['cat_id'], Acl::DELETE) ||
 			($content['deleted'] && !$GLOBALS['egw_info']['user']['apps']['admin'] && $config['history'] == 'history'))
 		{
 			$read_only['delete'] = true;
@@ -564,19 +563,19 @@ 
 
 		// Can't make a resource with accessories an accessory
 		$read_only['accessory_of'] = $content['acc_count'];
-		if($read_only['accessory_of'])
+		if ($read_only['accessory_of'])
 		{
 			$content['accessory_label'] = lang('Remove accessories before changing Accessory of');
 		}
 
 		// Disable custom tab if there are no custom fields defined
-		$read_only['tabs']['custom'] = !(Api\Storage\Customfields::get('resources',true));
-		$read_only['tabs']['history'] = ($content['history']['id'] != 0?false:true);
+		$read_only['tabs']['custom'] = !(Api\Storage\Customfields::get('resources', true));
+		$read_only['tabs']['history'] = ($content['history']['id'] != 0 ? false : true);
 
 		$preserv = $content;
 
 		$this->tmpl->read('resources.edit');
-		return $this->tmpl->exec('resources.resources_ui.edit',$content,$sel_options,$read_only,$preserv,2);
+		return $this->tmpl->exec('resources.resources_ui.edit', $content, $sel_options, $read_only, $preserv, 2);
 	}
 
 }

Doc Comments +1 added lines, -1 removed lines

@@ -1053,7 +1053,7 @@
 	 * @param int &$success number of succeded actions
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 timesheets 'deleted'
-	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
+	 * @param string $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)

Braces +57 added lines, -16 removed lines

@@ -105,7 +105,9 @@ 
 					}
 				}
 			}
-		} else {
+		}
+		else
+		{
 			$msg = $content;
 		}
 		$content = array();
@@ -140,7 +142,8 @@ 
 			$content['nm']['options-filter2'][resources_bo::DELETED] = lang('Deleted');
 		}
 
-		if($_GET['search']) {
+		if($_GET['search'])
+		{
 			$content['nm']['search'] = $_GET['search'];
 		}
 		if($_GET['view_accs_of'])
@@ -305,7 +308,10 @@ 
 				foreach($checked as $n=>$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if(!$id)
+					{
+						continue;
+					}
 					$resource = $this->bo->read($id);
 					$resource['deleted'] = null;
 					if($resource['accessory_of'] > 0)
@@ -337,7 +343,10 @@ 
 					}
 					$success++;
 				}
-				if($restored_accessories) $action_msg .= ", " . lang('%1 accessories restored',$restored_accessories);
+				if($restored_accessories)
+				{
+					$action_msg .= ", " . lang('%1 accessories restored',$restored_accessories);
+				}
 				break;
 			case 'delete':
 				$action_msg = lang('deleted');
@@ -345,7 +354,10 @@ 
 				foreach($checked as $n => &$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if(!$id)
+					{
+						continue;
+					}
 					$resource = $this->bo->read($id);
 					if($settings == 'promote')
 					{
@@ -371,7 +383,10 @@ 
 
 							// Don't need to process these ones now
 							$checked_key = array_search($acc_id, $checked);
-							if($checked_key !== false) unset($checked[$checked_key]);
+							if($checked_key !== false)
+							{
+								unset($checked[$checked_key]);
+							}
 						}
 					}
 					else
@@ -401,7 +416,10 @@ 
 						$failed++;
 					}
 				}
-				if($promoted_accessories) $action_msg .= ", " . lang('%1 accessories now resources',$promoted_accessories);
+				if($promoted_accessories)
+				{
+					$action_msg .= ", " . lang('%1 accessories now resources',$promoted_accessories);
+				}
 				break;
 		}
 		return $failed == 0;
@@ -443,7 +461,10 @@ 
 						if($acc_count && $content['accessory_of'] != -1)
 						{
 							// Resource with accessories changed into accessory
-							if($acc_count) $msg = lang('%1 accessories now resources',$acc_count);
+							if($acc_count)
+							{
+								$msg = lang('%1 accessories now resources',$acc_count);
+							}
 						}
 					}
 					else
@@ -475,9 +496,18 @@ 
 
 		$nm_session_data = Api\Cache::getSession('resources', 'index_nm');
 		$res_id = is_numeric($content) ? (int)$content : $content['res_id'];
-		if (isset($_GET['res_id'])) $res_id = $_GET['res_id'];
-		if (isset($nm_session_data['filter2']) && $nm_session_data['filter2'] > 0) $accessory_of = $nm_session_data['filter2'];
-		if (isset($_GET['accessory_of'])) $accessory_of = $_GET['accessory_of'];
+		if (isset($_GET['res_id']))
+		{
+			$res_id = $_GET['res_id'];
+		}
+		if (isset($nm_session_data['filter2']) && $nm_session_data['filter2'] > 0)
+		{
+			$accessory_of = $nm_session_data['filter2'];
+		}
+		if (isset($_GET['accessory_of']))
+		{
+			$accessory_of = $_GET['accessory_of'];
+		}
 		$content = array('res_id' => $res_id);
 		if ($res_id > 0)
 		{
@@ -487,7 +517,9 @@ 
 				'to_id' => $res_id,
 				'to_app' => 'resources'
 			);
-		} elseif ($accessory_of > 0) {
+		}
+		elseif ($accessory_of > 0)
+		{
 			// Pre-set according to parent
 			$owner = $this->bo->read($accessory_of);
 			if($owner['accessory_of'] > 0)
@@ -498,16 +530,22 @@ 
 			}
 			$content['cat_id'] = $owner['cat_id'];
 			$content['bookable'] = true;
-		} else {
+		}
+		else
+		{
 			// New resource
 			$content['cat_id'] = $nm_session_data['filter'];
 			$content['bookable'] = true;
 		}
-		if($msg) {
+		if($msg)
+		{
 			$content['msg'] = $msg;
 		}
 
-		if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);
+		if ($_GET['msg'])
+		{
+			$content['msg'] = strip_tags($_GET['msg']);
+		}
 
 		// some presetes
 		$content['resource_picture'] = $this->bo->get_picture($content['res_id'],false);
@@ -545,7 +583,10 @@ 
 		);
 
 		$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('',$search_options);
-		if($res_id) unset($sel_options['accessory_of'][$res_id]);
+		if($res_id)
+		{
+			unset($sel_options['accessory_of'][$res_id]);
+		}
 
 // 		$content['general|page|pictures|links'] = 'resources.edit_tabs.page';  //debug