Ticket #1527: version-privacy.patch

Chat

@@ -2127 +2127 @@
 
     if( request ) {
         if( [command isCaseInsensitiveEqualToString:@"VERSION"] ) {
-            NSDictionary *systemVersion = [[NSDictionary allocWithZone:nil] initWithContentsOfFile:@"/System/Library/CoreServices/ServerVersion.plist"];
-            if( ! [systemVersion count] ) systemVersion = [[NSDictionary allocWithZone:nil] initWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
+            NSUserDefaults * userDefaults = [NSUserDefaults standardUserDefaults];
+            BOOL hideSystemName = [userDefaults boolForKey:@"MVChatHideSystemName"];
+            BOOL hideSystemVersion = [userDefaults boolForKey:@"MVChatHideSystemVersion"];
+            BOOL hideSystemArch = [userDefaults boolForKey:@"MVChatHideSystemArch"];
+            
             NSDictionary *clientVersion = [[NSBundle mainBundle] infoDictionary];
-
+            NSDictionary *systemVersion = nil;
+            
+            systemVersion = [[NSDictionary allocWithZone:nil] initWithContentsOfFile:@"/System/Library/CoreServices/ServerVersion.plist"];
+            if ( ! [systemVersion count] )
+            {
+                [systemVersion release];
+                systemVersion = [[NSDictionary allocWithZone:nil] initWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
+            }
+            
 #if __ppc__
             NSString *processor = @"PowerPC";
 #elif __i386__
@@ -2141 +2152 @@
             NSString *processor = @"Unknown Architecture";
 #endif
 
-            NSString *reply = [[NSString allocWithZone:nil] initWithFormat:@"%@ %@ (%@) - %@ %@ (%@) - %@", [clientVersion objectForKey:@"CFBundleName"], [clientVersion objectForKey:@"CFBundleShortVersionString"], [clientVersion objectForKey:@"CFBundleVersion"], [systemVersion objectForKey:@"ProductName"], [systemVersion objectForKey:@"ProductVersion"], processor, [clientVersion objectForKey:@"MVChatCoreCTCPVersionReplyInfo"]];
+            NSMutableString *reply = [[NSMutableString allocWithZone:nil] init];
+            [reply appendFormat:@"%@ %@ (%@)",
+                [clientVersion objectForKey:@"CFBundleName"],
+                [clientVersion objectForKey:@"CFBundleShortVersionString"],
+                [clientVersion objectForKey:@"CFBundleVersion"]];
+            
+            if (!hideSystemName || !hideSystemVersion || !hideSystemArch)
+                [reply appendString:@" -"];
+            
+            if (!hideSystemName)
+                [reply appendFormat:@" %@", [systemVersion objectForKey:@"ProductName"]];
+            if (!hideSystemVersion)
+                [reply appendFormat:@" %@", [systemVersion objectForKey:@"ProductVersion"]];
+            if (!hideSystemArch)
+                [reply appendFormat:@" (%@)", processor];
+            
+            [reply appendFormat:@" - %@", [clientVersion objectForKey:@"MVChatCoreCTCPVersionReplyInfo"]];
+                
             [sender sendSubcodeReply:command withArguments:reply];
 
             [reply release];