Navigation

← Previous Changeset
Next Changeset →

Changeset 216

Timestamp:

04/08/08 01:29:18 (8 months ago)

Author:

Slynderdale

Message:

Some things I missed in the clean up.

Files:

trunk/Phergie/Bot.php (modified) (1 diff)
trunk/Phergie/Plugin/Abstract/Base.php (modified) (1 diff)
trunk/Phergie/Plugin/Drink.php (modified) (16 diffs)
trunk/Phergie/Plugin/Users.php (modified) (18 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/Phergie/Bot.php

r215	r216
147	147	*/
148	148	if ($config['debug']) {
149		error_reporting(E_ALL\|E_STRICT);
	149	error_reporting(E_ALL \| E_STRICT);
150	150	ini_set('display_errors', true);
151	151	ini_set('ignore_repeated_errors', true);

trunk/Phergie/Plugin/Abstract/Base.php

r215	r216
381	381	// Handle the flags using bitwise operations. 1=-flag, 2=+flag, 3=Both a plus and minus
382	382	if (isset($data['flags'][$flag])) {
383		$data['flags'][$flag]\|= (substr($match, 0, 1) === '-' ? 0x1 : 0x2);
	383	$data['flags'][$flag] \|= (substr($match, 0, 1) === '-' ? 0x1 : 0x2);
384	384	} else {
385	385	$data['flags'][$flag] = (substr($match, 0, 1) === '-' ? 0x1 : 0x2);

trunk/Phergie/Plugin/Drink.php

r215	r216
82	82	* @return void
83	83	*/
84		public function init()
	84	public function init()
85	85	{
86	86	try {
…	…
119	119	$names = array();
120	120	$this->debug('Retrieving data for: Cocktail');
121		for ($i = 1; $i <= $limit; $i+= 150) {
	121	for ($i = 1; $i <= $limit; $i += 150) {
122	122	$contents = @file_get_contents('http://www.webtender.com/db/browse?level=2&dir=drinks&char=%2A&start=' . $i);
123	123	if ($contents === false) {
…	…
197	197	* @return bool TRUE if dependencies are met, FALSE otherwise
198	198	*/
199		public static function checkDependencies(Phergie_Driver_Abstract $client, array$plugins)
	199	public static function checkDependencies(Phergie_Driver_Abstract $client, array$plugins)
200	200	{
201	201	if (!extension_loaded('PDO') \|\| !extension_loaded('pdo_sqlite')) {
…	…
213	213	* otherwise
214	214	*/
215		private function needTable($name)
	215	private function needTable($name)
216	216	{
217	217	$table = $this->db->query('SELECT COUNT(*) FROM sqlite_master WHERE name = ' . $this->db->quote($name))->fetchColumn();
…	…
231	231	* @return void
232	232	*/
233		private function populateTable($table, $names)
	233	private function populateTable($table, $names)
234	234	{
235	235	$this->debug('Creating the database schema for: ' . ucfirst($table));
…	…
256	256	* @return string Value of the name column for the selected record
257	257	*/
258		private function getRandomRecord($table)
	258	private function getRandomRecord($table)
259	259	{
260	260	return $this->db->query('SELECT name FROM ' . $table . ' ORDER BY Random() LIMIT 1')->fetchColumn();
…	…
267	267	* @param string $name Value to check
268	268	*/
269		private function hasBadChars($name)
	269	private function hasBadChars($name)
270	270	{
271	271	return (max(array_map('ord', str_split($name))) > 126);
…	…
279	279	* @return string Resolved target
280	280	*/
281		protected function resolveTarget($target)
	281	protected function resolveTarget($target)
282	282	{
283	283	$target = rtrim(trim($target), '.?!');
…	…
310	310	* @return void
311	311	*/
312		protected function throwDrink($type, $target)
	312	protected function throwDrink($type, $target)
313	313	{
314	314	if (!$this->db) {
…	…
340	340	* @return void
341	341	*/
342		public function onDoBeer($target)
	342	public function onDoBeer($target)
343	343	{
344	344	$this->throwDrink('beer', $target);
…	…
351	351	* @return void
352	352	*/
353		public function onDoBooze($target)
	353	public function onDoBooze($target)
354	354	{
355	355	$this->throwDrink('beer', $target);
…	…
362	362	* @return void
363	363	*/
364		public function onDoCocktail($target)
	364	public function onDoCocktail($target)
365	365	{
366	366	$this->throwDrink('cocktail', $target);
…	…
373	373	* @return void
374	374	*/
375		public function onDoCoke($target)
	375	public function onDoCoke($target)
376	376	{
377	377	$this->throwDrink('coke', $target);
…	…
384	384	* @return void
385	385	*/
386		public function onDoSoda($target)
	386	public function onDoSoda($target)
387	387	{
388	388	$this->throwDrink('coke', $target);
…	…
395	395	* @return void
396	396	*/
397		public function onDoPop($target)
	397	public function onDoPop($target)
398	398	{
399	399	$target = $this->resolveTarget($target);
…	…
408	408	* @return void
409	409	*/
410		public function onDoTea($target)
	410	public function onDoTea($target)
411	411	{
412	412	$this->throwDrink('tea', $target);

trunk/Phergie/Plugin/Users.php

r215	r216
27	27	* @return void
28	28	*/
29		public function init()
	29	public function init()
30	30	{
31	31	self::$instance = $this;
…	…
37	37	* @return void
38	38	*/
39		public function onMode()
	39	public function onMode()
40	40	{
41	41	$args = $this->event->getArguments();
…	…
61	61	$nick = array_shift($nicks);
62	62	if ($mode == '+') {
63		self::$list[$chan][$nick]\|= self::OP;
	63	self::$list[$chan][$nick] \|= self::OP;
64	64	} elseif ($mode == '-') {
65		self::$list[$chan][$nick]^= self::OP;
	65	self::$list[$chan][$nick] ^= self::OP;
66	66	}
67	67	break;
…	…
70	70	$nick = array_shift($nicks);
71	71	if ($mode == '+') {
72		self::$list[$chan][$nick]\|= self::OP;
	72	self::$list[$chan][$nick] \|= self::OP;
73	73	} elseif ($mode == '-') {
74		self::$list[$chan][$nick]^= self::OP;
	74	self::$list[$chan][$nick] ^= self::OP;
75	75	}
76	76	break;
…	…
79	79	$nick = array_shift($nicks);
80	80	if ($mode == '+') {
81		self::$list[$chan][$nick]\|= self::OP;
	81	self::$list[$chan][$nick] \|= self::OP;
82	82	} elseif ($mode == '-') {
83		self::$list[$chan][$nick]^= self::OP;
	83	self::$list[$chan][$nick] ^= self::OP;
84	84	}
85	85	break;
…	…
94	94	* @return void
95	95	*/
96		public function onPrivmsg()
	96	public function onPrivmsg()
97	97	{
98	98	if ($this->getIni('debug') && $this->fromAdmin(false)) {
…	…
113	113	* @return void
114	114	*/
115		public function onJoin()
	115	public function onJoin()
116	116	{
117	117	$arg = trim(strtolower($this->event->getArgument(0)));
…	…
126	126	* @return void
127	127	*/
128		public function onPart()
	128	public function onPart()
129	129	{
130	130	$arg = trim(strtolower($this->event->getArgument(0)));
…	…
141	141	* @return void
142	142	*/
143		public function onQuit()
	143	public function onQuit()
144	144	{
145	145	$nick = trim(strtolower($this->event->getNick()));
…	…
157	157	* @return void
158	158	*/
159		public function onNick()
	159	public function onNick()
160	160	{
161	161	$nick = trim(strtolower($this->event->getNick()));
…	…
176	176	* @return void
177	177	*/
178		public function onResponse()
	178	public function onResponse()
179	179	{
180	180	if ($this->event->getCode() == Phergie_Event_Response::RPL_NAMREPLY) {
…	…
209	209	* @return bool
210	210	*/
211		public static function isOp($nick, $chan)
	211	public static function isOp($nick, $chan)
212	212	{
213	213	$nick = trim(strtolower($nick));
…	…
224	224	* @return bool
225	225	*/
226		public static function isVoice($nick, $chan)
	226	public static function isVoice($nick, $chan)
227	227	{
228	228	$nick = trim(strtolower($nick));
…	…
239	239	* @return bool
240	240	*/
241		public static function isHalfop($nick, $chan)
	241	public static function isHalfop($nick, $chan)
242	242	{
243	243	$nick = trim(strtolower($nick));
…	…
254	254	* @return bool
255	255	*/
256		public static function isIn($nick, $chan)
	256	public static function isIn($nick, $chan)
257	257	{
258	258	$nick = trim(strtolower($nick));
…	…
269	269	* @return array\|bool
270	270	*/
271		public static function getUsers($chan)
	271	public static function getUsers($chan)
272	272	{
273	273	$chan = trim(strtolower($chan));
…	…
285	285	* @return string\|bool
286	286	*/
287		public static function getRandomUser($chan)
	287	public static function getRandomUser($chan)
288	288	{
289	289	$chan = trim(strtolower($chan));
…	…
302	302	* @return array List of channels
303	303	*/
304		public static function getChannels($nick = null)
	304	public static function getChannels($nick = null)
305	305	{
306	306	if (empty($nick)) {

Phergie

Navigation

Changeset 216

Legend:

trunk/Phergie/Bot.php

trunk/Phergie/Plugin/Abstract/Base.php

trunk/Phergie/Plugin/Drink.php

trunk/Phergie/Plugin/Users.php

Download in other formats: