diff --git a/Database/Database-ExchangeRates.cs b/Database/Database-ExchangeRates.cs index 6640f351..ad630721 100644 --- a/Database/Database-ExchangeRates.cs +++ b/Database/Database-ExchangeRates.cs @@ -56,8 +56,6 @@ namespace Swarmops.Database { if (reader.Read()) { - DateTime testDate = reader.GetDateTime (3); - return reader.GetDouble(2); } diff --git a/Database/Database-FinancialValidations.cs b/Database/Database-FinancialValidations.cs index dc0c0bf6..dd0b361e 100644 --- a/Database/Database-FinancialValidations.cs +++ b/Database/Database-FinancialValidations.cs @@ -30,7 +30,6 @@ namespace Swarmops.Database int foreignId = reader.GetInt32 (3); DateTime dateTime = reader.GetDateTime (4); int personId = reader.GetInt32 (5); - double amount = reader.GetDouble (6); // not yet used return new BasicFinancialValidation (financialValidationId, validationType, personId, dateTime, dependencyType, foreignId); diff --git a/Database/Database-InboundInvoices.cs b/Database/Database-InboundInvoices.cs index c523c442..581064ae 100644 --- a/Database/Database-InboundInvoices.cs +++ b/Database/Database-InboundInvoices.cs @@ -25,7 +25,7 @@ namespace Swarmops.Database int inboundInvoiceId = reader.GetInt32 (0); int organizationId = reader.GetInt32 (1); DateTime createdDateTime = reader.GetDateTime (2); - int createdByPersonId = reader.GetInt32 (3); + // int createdByPersonId = reader.GetInt32 (3); // TODO: Do we care about this field? DateTime dueDate = reader.GetDateTime (4); Int64 amountCents = reader.GetInt64 (5); int budgetId = reader.GetInt32 (6); diff --git a/Database/Database-Participation.cs b/Database/Database-Participation.cs index 32551ff6..bebd3c7d 100644 --- a/Database/Database-Participation.cs +++ b/Database/Database-Participation.cs @@ -387,8 +387,6 @@ namespace Swarmops.Database throw new ArgumentOutOfRangeException ("OrganizationId cannot be 0"); } - List result = new List(); - using (DbConnection connection = GetMySqlDbConnection()) { connection.Open(); diff --git a/Database/Database-Tests.cs b/Database/Database-Tests.cs index e59e80df..dbb67a00 100644 --- a/Database/Database-Tests.cs +++ b/Database/Database-Tests.cs @@ -183,7 +183,7 @@ namespace Swarmops.Database DbCommand command = GetDbCommand ( "SELECT * FROM CredentialsTests", connection); - DbDataReader reader = command.ExecuteReader(); + command.ExecuteReader(); return true; } diff --git a/Database/Database.csproj b/Database/Database.csproj index c8916333..d5ea05cc 100644 --- a/Database/Database.csproj +++ b/Database/Database.csproj @@ -117,7 +117,6 @@ - diff --git a/Logic/Communications/PhoneMessageReceiver.cs b/Logic/Communications/PhoneMessageReceiver.cs index 40d6f2f5..51da0e43 100644 --- a/Logic/Communications/PhoneMessageReceiver.cs +++ b/Logic/Communications/PhoneMessageReceiver.cs @@ -148,8 +148,8 @@ namespace Swarmops.Logic.Communications ForwardMessage (from, to, subject, body); msg.ReplyMessage += "\r\nDitt meddelande har vidarebefordrats till medlemsservice@piratpartiet.se. Kontakta oss om du undrar över något."; - PWLog.Write (PWLogItem.None, 0, PWLogAction.SMSHandled, "Forwarded SMS from " + msg.FromNumber + " to " + to, - msg.Message + "\r\n" + msg.ErrorMessage); + //PWLog.Write (PWLogItem.None, 0, PWLogAction.SMSHandled, "Forwarded SMS from " + msg.FromNumber + " to " + to, + // msg.Message + "\r\n" + msg.ErrorMessage); return true; } diff --git a/Logic/Logic.csproj b/Logic/Logic.csproj index ab4ae7d3..6f460add 100644 --- a/Logic/Logic.csproj +++ b/Logic/Logic.csproj @@ -422,7 +422,6 @@ - diff --git a/Logic/Support/ActivistEvents.cs b/Logic/Support/ActivistEvents.cs index 5b3ceba9..6ccedbf7 100644 --- a/Logic/Support/ActivistEvents.cs +++ b/Logic/Support/ActivistEvents.cs @@ -18,7 +18,7 @@ namespace Swarmops.Logic.Support 0, string.Empty); p.TerminateActivist(); - PWLog.Write (PWLogItem.Person, p.Identity, PWLogAction.ActivistLost, "Lost as activist", string.Empty); + //PWLog.Write (PWLogItem.Person, p.Identity, PWLogAction.ActivistLost, "Lost as activist", string.Empty); } @@ -34,8 +34,8 @@ namespace Swarmops.Logic.Support 0, string.Empty); newActivist.CreateActivist (isPublic, isConfirmed); - PWLog.Write (newActivist, PWLogItem.Person, newActivist.Identity, PWLogAction.ActivistJoin, - "New activist joined.", logMessage); + //PWLog.Write (newActivist, PWLogItem.Person, newActivist.Identity, PWLogAction.ActivistJoin, + // "New activist joined.", logMessage); } } } \ No newline at end of file diff --git a/Logic/Swarm/AuditedPerson.cs b/Logic/Swarm/AuditedPerson.cs index 58b6c7ac..35225a24 100644 --- a/Logic/Swarm/AuditedPerson.cs +++ b/Logic/Swarm/AuditedPerson.cs @@ -284,8 +284,10 @@ namespace Swarmops.Logic.Swarm { if (this.executor != null && ("" + oldVal).Trim() != ("" + newVal).Trim()) { - PWLog.Write (this.executor, PWLogItem.Person, this.person.Identity, PWLogAction.PersonFieldChange, - this.actionDescr, "", field, "" + oldVal, "" + newVal); + //PWLog.Write (this.executor, PWLogItem.Person, this.person.Identity, PWLogAction.PersonFieldChange, + // this.actionDescr, "", field, "" + oldVal, "" + newVal); + + // TODO: New log format } } diff --git a/Logic/Swarm/Participation.cs b/Logic/Swarm/Participation.cs index 68a9acaf..89498793 100644 --- a/Logic/Swarm/Participation.cs +++ b/Logic/Swarm/Participation.cs @@ -197,8 +197,8 @@ namespace Swarmops.Logic.Swarm // REMOVED: everything Roles related; being phased out - PWLog.Write (actingPerson.Identity, PWLogItem.Person, Person.Identity, PWLogAction.MemberLost, - eventSource + ":" + description, string.Empty); + //PWLog.Write (actingPerson.Identity, PWLogItem.Person, Person.Identity, PWLogAction.MemberLost, + // eventSource + ":" + description, string.Empty); PWEvents.CreateEvent (EventSource.PirateWeb, EventType.LostMember, actingPerson.Identity, OrganizationId, Person.GeographyId, Person.Identity, 0, OrganizationId.ToString()); diff --git a/Utility/BotCode/RosterHousekeeping.cs b/Utility/BotCode/RosterHousekeeping.cs index e3b3a8cd..51fccc78 100644 --- a/Utility/BotCode/RosterHousekeeping.cs +++ b/Utility/BotCode/RosterHousekeeping.cs @@ -127,10 +127,10 @@ namespace Swarmops.Utility.BotCode membership.Organization.Name + "."); SendReminderMail (membership); Console.Write ("."); - PWLog.Write (PWLogItem.Person, membership.PersonId, + /*PWLog.Write (PWLogItem.Person, membership.PersonId, PWLogAction.MembershipRenewReminder, "Mail was sent to " + membership.Person.Mail + - " reminding to renew membership in " + membership.Organization.Name + ".", string.Empty); + " reminding to renew membership in " + membership.Organization.Name + ".", string.Empty);*/ Console.Write ("."); @@ -148,9 +148,9 @@ namespace Swarmops.Utility.BotCode string logText = "FAILED sending mail to " + membership.Person.Mail + " for reminder of pending renewal in " + membership.Organization.Name + "."; failedReminders.Add (membership.Person.Canonical); - PWLog.Write (PWLogItem.Person, membership.PersonId, + /*PWLog.Write (PWLogItem.Person, membership.PersonId, PWLogAction.MembershipRenewReminder, - logText, string.Empty); + logText, string.Empty);*/ ExceptionMail.Send (new Exception (logText, x)); } } @@ -301,10 +301,10 @@ namespace Swarmops.Utility.BotCode try { SendReminderMail (membership); - PWLog.Write (PWLogItem.Person, membership.PersonId, + /*PWLog.Write (PWLogItem.Person, membership.PersonId, PWLogAction.MembershipRenewReminder, "Mail was sent to " + membership.Person.Mail + - " reminding to renew membership in " + membership.Organization.Name + ".", string.Empty); + " reminding to renew membership in " + membership.Organization.Name + ".", string.Empty);*/ } catch (Exception ex) {