Skip to content
This repository has been archived by the owner on Nov 14, 2017. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
157
  • Loading branch information
macmule committed Nov 19, 2016
1 parent 4e8099f commit 2a52698
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 31 deletions.
Expand Up @@ -2,20 +2,4 @@
<Bucket
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "ADPassMon/ADPassMonAppDelegate.applescript"
timestampString = "500646809.370551"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "866"
endingLineNumber = "866">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
34 changes: 19 additions & 15 deletions ADPassMon/ADPassMonAppDelegate.applescript
Expand Up @@ -765,7 +765,7 @@ Enable it now?" with icon 2 buttons {"No","Yes"} default button 2)
set my daysUntilExpNice to round daysUntilExp rounding down
set logMe to "ms-DS daysUntilExpNice: " & daysUntilExpNice
logToFile_(me)
updateMenuTitle_((daysUntilExpNice as string) & "d", "Your password expires on:\n" & expirationDate)
updateMenuTitle_((daysUntilExpNice as string) & "d", expirationDate)
end easyDate_

-- If ms-DS cannot be used, try via DSCL and if that fails LDAP
Expand Down Expand Up @@ -889,23 +889,27 @@ Enable it now?" with icon 2 buttons {"No","Yes"} default button 2)
set my isIdle to false
logToFile_(me)
getADLDAP_(me)
-- Do this if we haven't run before, or the defaults have been reset.
if my expireDateUnix = 0 and my selectedMethod = 0
easyMethod_(me)
if my goEasy is false
if my onDomain is true
-- Do this if we haven't run before, or the defaults have been reset.
if my expireDateUnix = 0 and my selectedMethod = 0
easyMethod_(me)
if my goEasy is false
altMethod_(me)
end if
else
easyMethod_(me)
end if
if my goEasy is true and my selectedMethod = 0
set logMe to "Using msDS method"
logToFile_(me)
easyDate_(expireDateUnix)
else
set logMe to "Using alt method"
logToFile_(me)
altMethod_(me)
end if
else
easyMethod_(me)
end if
if my goEasy is true and my selectedMethod = 0
set logMe to "Using msDS method"
logToFile_(me)
easyDate_(expireDateUnix)
else
set logMe to "Using alt method"
logToFile_(me)
altMethod_(me)
offlineUpdate_(me)
end if
end if
on error theError
Expand Down

0 comments on commit 2a52698

Please sign in to comment.