Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 18ac9009

Přidáno uživatelem Ondřej Fibich před asi 9 roky(ů)

Fix merge issue that removed all staff from developer branch :-).

Zobrazit rozdíly:

application/models/message.php
*/
const FORMER_MEMBER_MESSAGE = 19;
/**
* content of e-mail for contact verification
*/
const VERIFY_CONTACT_MESSAGE = 20;
// self-cancel constants
/**
......
self::INTERRUPTED_MEMBERSHIP_BEGIN_NOTIFY_MESSAGE => 'Membership interrupt begins notification',
self::INTERRUPTED_MEMBERSHIP_END_NOTIFY_MESSAGE => 'Membership interrupt ends notification',
self::FORMER_MEMBER_MESSAGE => 'Former member message',
self::VERIFY_CONTACT_MESSAGE => 'Verify contact message'
);
/**
......
$type != self::MONITORING_HOST_DOWN &&
$type != self::MONITORING_HOST_UP &&
$type != self::INTERRUPTED_MEMBERSHIP_BEGIN_NOTIFY_MESSAGE &&
$type != self::INTERRUPTED_MEMBERSHIP_END_NOTIFY_MESSAGE
$type != self::INTERRUPTED_MEMBERSHIP_END_NOTIFY_MESSAGE &&
$type != self::VERIFY_CONTACT_MESSAGE
);
}
......
$type == self::MONITORING_HOST_UP ||
$type == self::INTERRUPTED_MEMBERSHIP_BEGIN_NOTIFY_MESSAGE ||
$type == self::INTERRUPTED_MEMBERSHIP_END_NOTIFY_MESSAGE ||
$type == self::FORMER_MEMBER_MESSAGE
$type == self::FORMER_MEMBER_MESSAGE ||
$type == self::VERIFY_CONTACT_MESSAGE
);
}
......
$type != self::INTERRUPTED_MEMBERSHIP_MESSAGE &&
$type != self::INTERRUPTED_MEMBERSHIP_BEGIN_NOTIFY_MESSAGE &&
$type != self::INTERRUPTED_MEMBERSHIP_END_NOTIFY_MESSAGE &&
$type != self::FORMER_MEMBER_MESSAGE
$type != self::FORMER_MEMBER_MESSAGE &&
$type != self::VERIFY_CONTACT_MESSAGE
);
}

Také k dispozici: Unified diff