[Macattrick-commit] macattrick Devel Macattrick-Info.plist,1.4,1.5 FormulasViewController.h,1.4,1.5 FormulasViewController.m,1.4,1.5 HattrickOrg.m,1.18,1.19 Info.plist,1.6,1.7 LoginController.m,1.12,1.13 Macattrick-Info.plist,1.4,1.5 Team.m,1.20,1.21 main.m,1.14,1.15

[Geisschaes <gei...@us...>]

Update of /cvsroot/macattrick/macattrick
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19953

Modified Files:
	Devel Macattrick-Info.plist FormulasViewController.h 
	FormulasViewController.m HattrickOrg.m Info.plist 
	LoginController.m Macattrick-Info.plist Team.m main.m 
Log Message:
changed login to security code. password is changed in keychain

Index: Info.plist
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Info.plist,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Info.plist	22 Dec 2004 18:47:28 -0000	1.6
--- Info.plist	27 Feb 2005 15:14:44 -0000	1.7
***************
*** 18,22 ****
  	<string>????</string>
  	<key>CFBundleVersion</key>
! 	<string>0.4</string>
  	<key>NSMainNibFile</key>
  	<string>MainWindow</string>
--- 18,22 ----
  	<string>????</string>
  	<key>CFBundleVersion</key>
! 	<string>0.5</string>
  	<key>NSMainNibFile</key>
  	<string>MainWindow</string>

Index: FormulasViewController.h
===================================================================
RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FormulasViewController.h	16 Feb 2005 21:32:58 -0000	1.4
--- FormulasViewController.h	27 Feb 2005 15:14:44 -0000	1.5
***************
*** 36,40 ****
  	Position *centralDefenderTowardsWing;
  	Position *centralDefenderOffensive;
- 	Position *centralDefenderDefensive;
  	Position *wingback;
  	Position *wingbackTowardsMiddle;
--- 36,39 ----
***************
*** 51,55 ****
  	Position *forward;
  	Position *forwardDefensive;
- 	IBOutlet NSTextField *keeperTotal;
  	IBOutlet NSView *formulasView;
  }
--- 50,53 ----

Index: main.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/main.m,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** main.m	10 Jan 2005 19:41:09 -0000	1.14
--- main.m	27 Feb 2005 15:14:44 -0000	1.15
***************
*** 34,38 ****
  
  // comment out for main build
! #import "Test/AllTests.h"
  //
  
--- 34,38 ----
  
  // comment out for main build
! //#import "Test/AllTests.h"
  //
  
***************
*** 47,51 ****
  
  	[Properties initializeUserDefaults];
! 	// comment out for main build
  	NSArray *args = [[NSProcessInfo processInfo] arguments];
  	if ([args count] >= 2 && [[args objectAtIndex:1] isEqualToString: @"test"]) {
--- 47,51 ----
  
  	[Properties initializeUserDefaults];
! 	/*/ comment out for main build
  	NSArray *args = [[NSProcessInfo processInfo] arguments];
  	if ([args count] >= 2 && [[args objectAtIndex:1] isEqualToString: @"test"]) {
***************
*** 53,57 ****
  		return 0;
  	}
! 	//
  	
  	return NSApplicationMain(argc, argv);
--- 53,57 ----
  		return 0;
  	}
! 	/*/
  	
  	return NSApplicationMain(argc, argv);

Index: HattrickOrg.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/HattrickOrg.m,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** HattrickOrg.m	7 Feb 2005 21:15:39 -0000	1.18
--- HattrickOrg.m	27 Feb 2005 15:14:44 -0000	1.19
***************
*** 75,79 ****
      loginName = newLoginName;
      [newPassword retain];
!     [password release];
      password = newPassword;
  }
--- 75,79 ----
      loginName = newLoginName;
      [newPassword retain];
! 	[password release];
      password = newPassword;
  }
***************
*** 95,99 ****
  - (void) login {
  	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
! 	NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?action=login&loginName=%s&password=%s", 
  		[serverName cString], [loginName cString], [password cString]];
  	NSError *error;
--- 95,99 ----
  - (void) login {
  	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
! 	NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?actionType=login&loginType=CHPP&Loginname=%s&readonlypassword=%s", 
  		[serverName cString], [loginName cString], [password cString]];
  	NSError *error;
***************
*** 108,112 ****
  - (void) logout {
  	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
! 	NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?action=logout", 
  		[serverName cString]];
  	NSError *error;
--- 108,112 ----
  - (void) logout {
  	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
! 	NSString *urlString = [NSString stringWithFormat:@"http://%s/Common/default.asp?actionType=logout", 
  		[serverName cString]];
  	NSError *error;
***************
*** 191,195 ****
  -(NSURLRequest*) buildRequest: (NSString*) urlString {
  		NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString: urlString ]];
! 		[request addValue:@"Macattrick v0.4" forHTTPHeaderField:@"User-Agent"];	
  		return request;
  }
--- 191,195 ----
  -(NSURLRequest*) buildRequest: (NSString*) urlString {
  		NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString: urlString ]];
! 		[request addValue:@"Macattrick v0.5" forHTTPHeaderField:@"User-Agent"];	
  		return request;
  }

Index: FormulasViewController.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/FormulasViewController.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** FormulasViewController.m	16 Feb 2005 21:33:06 -0000	1.4
--- FormulasViewController.m	27 Feb 2005 15:14:44 -0000	1.5
***************
*** 73,76 ****
--- 73,93 ----
  -(void) ok {
  	[[PositionHeap uniqueInstance] setPosition: keeper];
+ 	[[PositionHeap uniqueInstance] setPosition: centralDefender];
+ 	[[PositionHeap uniqueInstance] setPosition: centralDefenderTowardsWing];
+ 	[[PositionHeap uniqueInstance] setPosition: centralDefenderOffensive];
+ 	[[PositionHeap uniqueInstance] setPosition: wingback];
+ 	[[PositionHeap uniqueInstance] setPosition: wingbackTowardsMiddle];
+ 	[[PositionHeap uniqueInstance] setPosition: wingbackDefensive];
+ 	[[PositionHeap uniqueInstance] setPosition: wingbackOffensive];
+ 	[[PositionHeap uniqueInstance] setPosition: innerMidfield];
+ 	[[PositionHeap uniqueInstance] setPosition: innerMidfieldTowardsWing];
+ 	[[PositionHeap uniqueInstance] setPosition: innerMidfieldOffensive];
+ 	[[PositionHeap uniqueInstance] setPosition: innerMidfieldDefensive];
+ 	[[PositionHeap uniqueInstance] setPosition: winger];
+ 	[[PositionHeap uniqueInstance] setPosition: wingerTowardsMiddle];
+ 	[[PositionHeap uniqueInstance] setPosition: wingerOffensive];
+ 	[[PositionHeap uniqueInstance] setPosition: wingerDefensive];
+ 	[[PositionHeap uniqueInstance] setPosition: forward];
+ 	[[PositionHeap uniqueInstance] setPosition: forwardDefensive];
  	[[PositionHeap uniqueInstance] savePositionsToUserDefaults];	
  }
***************
*** 131,140 ****
  
  
- - (Position *) centralDefenderDefensive { return centralDefenderDefensive; }
- - (void) setCentralDefenderDefensive: (Position *) newCentralDefenderDefensive {
-     [newCentralDefenderDefensive retain];
-     [centralDefenderDefensive release];
-     centralDefenderDefensive = newCentralDefenderDefensive;
- }
  
  
--- 148,151 ----

Index: LoginController.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/LoginController.m,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** LoginController.m	26 Dec 2004 14:03:21 -0000	1.12
--- LoginController.m	27 Feb 2005 15:14:44 -0000	1.13
***************
*** 40,44 ****
  	[self setLoginName:[[NSUserDefaults standardUserDefaults] stringForKey:@"loginName"]];
  	[self setServerName: [[NSUserDefaults standardUserDefaults] stringForKey:@"serverName"]];
! 	[self setPassword: [self passwordFromKeychain]];
  	
  
--- 40,46 ----
  	[self setLoginName:[[NSUserDefaults standardUserDefaults] stringForKey:@"loginName"]];
  	[self setServerName: [[NSUserDefaults standardUserDefaults] stringForKey:@"serverName"]];
! 	if([[NSUserDefaults standardUserDefaults] boolForKey:@"savePasswordInKeychain"]) {
! 		[self setPassword: [self passwordFromKeychain]];
! 	}
  	
  
***************
*** 84,99 ****
  
  -(OSStatus) savePasswordInKeychain{
! 		OSStatus status;
  		status = SecKeychainAddGenericPassword (	
!                 NULL,            // default keychain	
!                 strlen([@"Macattrick" UTF8String]),              // length of service name	
!                 [@"Macattrick" UTF8String],    // service name	
!                 strlen([loginName UTF8String]),              // length of account name	
!                 [loginName UTF8String] ,    // account name
!                 strlen([password  UTF8String]),  // length of password
!                 [password UTF8String],        // pointer to password data
!                 NULL             // the item reference
  		);	
! 		return (status);	
  }
  
--- 86,126 ----
  
  -(OSStatus) savePasswordInKeychain{
! 	OSStatus status;
! 	OSStatus found;
! 	SecKeychainItemRef itemRef;
! 	found = SecKeychainFindGenericPassword(
! 		NULL,
! 		strlen([@"Macattrick" UTF8String]),// length of service name	
! 		[@"Macattrick" UTF8String],    // service name	
! 		strlen([loginName UTF8String]),
! 		[loginName UTF8String] , 
! 		0 , 
! 		NULL ,
! 		&itemRef);	
! 	// No item was found, add a new one..
! 	if(found != 0) {
  		status = SecKeychainAddGenericPassword (	
! 			NULL,            // default keychain	
! 			strlen([@"Macattrick" UTF8String]),              // length of service name	
! 			[@"Macattrick" UTF8String],    // service name	
! 			strlen([loginName UTF8String]),              // length of account name	
! 			[loginName UTF8String] ,    // account name
! 			strlen([password  UTF8String]),  // length of password
! 			[password UTF8String],        // pointer to password data
! 			&itemRef             // the item reference
  		);	
! 		if (status != 0) {
! 			NSLog(@"Keychain storage failed: %d", status);
! 		}
! 		return status;
! 	}
! 	NSData* d = [password dataUsingEncoding:NSUTF8StringEncoding];
! 	status = SecKeychainItemModifyAttributesAndData (
! 		itemRef,            // the item reference
! 		nil,        // no change to attributes
! 		strlen([password  UTF8String]),    // length of password
! 		[password UTF8String]      // pointer to password data			
! 	);			
! 	return (status);	
  }
  

Index: Devel Macattrick-Info.plist
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Devel Macattrick-Info.plist,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Devel Macattrick-Info.plist	22 Dec 2004 18:47:28 -0000	1.4
--- Devel Macattrick-Info.plist	27 Feb 2005 15:14:43 -0000	1.5
***************
*** 22,26 ****
  	<string>Roman Bertolami</string>
  	<key>CFBundleVersion</key>
! 	<string>0.4</string>
  	<key>NSMainNibFile</key>
  	<string>MainMenu</string>
--- 22,26 ----
  	<string>Roman Bertolami</string>
  	<key>CFBundleVersion</key>
! 	<string>0.5</string>
  	<key>NSMainNibFile</key>
  	<string>MainMenu</string>

Index: Team.m
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Team.m,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Team.m	20 Jan 2005 20:46:01 -0000	1.20
--- Team.m	27 Feb 2005 15:14:44 -0000	1.21
***************
*** 168,172 ****
  		[self setValue:currentStringValue forKey:elementName];
  	}
! 	else if ([elementName isEqualToString:@"HomePage"]) {
  		NSURL *url = [[NSURL alloc]initWithString:currentStringValue];
  		[self setHomepage:url];
--- 168,172 ----
  		[self setValue:currentStringValue forKey:elementName];
  	}
! 	else if (([elementName isEqualToString:@"HomePage"]) && (![currentStringValue isEqualToString:@""])) {
  		NSURL *url = [[NSURL alloc]initWithString:currentStringValue];
  		[self setHomepage:url];

Index: Macattrick-Info.plist
===================================================================
RCS file: /cvsroot/macattrick/macattrick/Macattrick-Info.plist,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Macattrick-Info.plist	22 Dec 2004 18:47:28 -0000	1.4
--- Macattrick-Info.plist	27 Feb 2005 15:14:44 -0000	1.5
***************
*** 22,26 ****
  	<string>Roman Bertolami</string>
  	<key>CFBundleVersion</key>
! 	<string>0.4</string>
  	<key>NSMainNibFile</key>
  	<string>MainMenu</string>
--- 22,26 ----
  	<string>Roman Bertolami</string>
  	<key>CFBundleVersion</key>
! 	<string>0.5</string>
  	<key>NSMainNibFile</key>
  	<string>MainMenu</string>