comparison src/protocols/zephyr/zephyr.c @ 4588:2778ebd04b63

[gaim-migrate @ 4872] Arun A Tharuvai (aat) writes: "I've fixed the following problems which I ran into recently. When subscribing getenv("USER") is used instead of ZGetSender() , causing subscriptions of the form class,instance,%me% to fail where a person's Zephyr username is different from their local username. Also, it segfaults whenever receiving zephyrs from senders that have no realm field. e.g. people with usernames of the form username instead of username@realmname . " committer: Tailor Script <[e-mail]>

4587:5040b5ea12e9

						serv_got_joined_chat(zgc, zt2->id, zt2->name);
					}
					/* If the person is in the default Realm, then strip the 
					   Realm from the sender field */
					sendertmp = g_strdup_printf("%s",notice.z_sender);
					realmptr = strchr(sendertmp,'@');
					realmptr++;
					if (!g_strcasecmp(realmptr,ZGetRealm())) {
						realmptr--;
						sprintf(realmptr,"%c",'\0');
						send_inst = g_strdup_printf("%s %s",sendertmp,
									    notice.z_class_inst);
								     
					} else {
						send_inst = g_strdup_printf("%s %s",notice.z_sender,
									    notice.z_class_inst);
					}
					serv_got_chat_in(zgc, zt2->id, send_inst, FALSE,
								buf2, time(NULL));
					g_free(sendertmp);
					g_free(send_inst);

		while (fgets(buff, BUFSIZ, f)) {
			strip_comments(buff);
			if (buff[0]) {
				triple = g_strsplit(buff, ",", 3);
				if (triple[0] && triple[1] ) {
					char *tmp = g_strdup_printf("%s@%s", g_getenv("USER"),
								    ZGetRealm());
					char *atptr;
					sub.zsub_class = triple[0];
					sub.zsub_classinst = triple[1];
					if(triple[2] == NULL) {
						recip = g_malloc0(1);
					} else if (!g_strcasecmp(triple[2], "%me%")) {
						recip = g_strdup_printf("%s@%s", g_getenv("USER"),
										ZGetRealm());
					} else if (!g_strcasecmp(triple[2], "*")) {
						/* wildcard
						 * form of class,instance,* */
						recip = g_malloc0(1);
					} else if (!g_strcasecmp(triple[2], tmp)) {

{
	ZSubscription_t sub;

	if (zgc) {
		do_error_dialog("Already logged in with Zephyr", "Because Zephyr uses your system username, you are unable to "
                                "have multiple accounts on it when logged in as the same user.", GAIM_ERROR);
		return;
	}

	zgc = new_gaim_conn(account);

	classname = data->data;
	instname = data->next->data;
	recip = data->next->next->data;
	if (!g_strcasecmp(recip, "%me%"))
		recip = g_getenv("USER");

	zt1 = new_triple(classname, instname, recip);
	zt2 = find_sub_by_triple(zt1);
	if (zt2) {
		free_triple(zt1);

4588:2778ebd04b63

						serv_got_joined_chat(zgc, zt2->id, zt2->name);
					}
					/* If the person is in the default Realm, then strip the 
					   Realm from the sender field */
					sendertmp = g_strdup_printf("%s",notice.z_sender);
					if (realmptr = strchr(sendertmp,'@')) {
						realmptr++;
						if (!g_strcasecmp(realmptr,ZGetRealm())) {
							realmptr--;
							sprintf(realmptr,"%c",'\0');
							send_inst = g_strdup_printf("%s %s",sendertmp,
										    notice.z_class_inst);
						} else {
							send_inst = g_strdup_printf("%s %s",notice.z_sender,
										    notice.z_class_inst);
						}
					} else {
						send_inst = g_strdup_printf("%s %s",sendertmp,notice.z_class_inst);
					}
					serv_got_chat_in(zgc, zt2->id, send_inst, FALSE,
								buf2, time(NULL));
					g_free(sendertmp);
					g_free(send_inst);

		while (fgets(buff, BUFSIZ, f)) {
			strip_comments(buff);
			if (buff[0]) {
				triple = g_strsplit(buff, ",", 3);
				if (triple[0] && triple[1] ) {
					/*					char *tmp = g_strdup_printf("%s@%s", g_getenv("USER"), 
										ZGetRealm());*/
					char *tmp = g_strdup_printf("%s",ZGetSender());
					char *atptr;
					sub.zsub_class = triple[0];
					sub.zsub_classinst = triple[1];
					if(triple[2] == NULL) {
						recip = g_malloc0(1);
					} else if (!g_strcasecmp(triple[2], "%me%")) {
						recip = g_strdup_printf("%s",ZGetSender());
					} else if (!g_strcasecmp(triple[2], "*")) {
						/* wildcard
						 * form of class,instance,* */
						recip = g_malloc0(1);
					} else if (!g_strcasecmp(triple[2], tmp)) {

{
	ZSubscription_t sub;

	if (zgc) {
		do_error_dialog("Already logged in with Zephyr", "Because Zephyr uses your system username, you are unable to "
				"have multiple accounts on it when logged in as the same user.", GAIM_ERROR);
		return;
	}

	zgc = new_gaim_conn(account);

	classname = data->data;
	instname = data->next->data;
	recip = data->next->next->data;
	if (!g_strcasecmp(recip, "%me%"))
		recip = ZGetSender();

	zt1 = new_triple(classname, instname, recip);
	zt2 = find_sub_by_triple(zt1);
	if (zt2) {
		free_triple(zt1);