浏览代码

Remove Calendar stuff.

dereuromark 9 年之前
父节点
当前提交
d15c2d38cd

+ 0 - 148
Controller/Component/CalendarComponent.php

@@ -1,148 +0,0 @@
-<?php
-
-App::uses('Component', 'Controller');
-
-/**
- * Calendar Component
- *
- * inspired by http://www.flipflops.org/2007/09/21/a-simple-php-calendar-function/
- *
- * @author Mark Scherer
- * @copyright 2012 Mark Scherer
- * @license http://opensource.org/licenses/mit-license.php MIT
- *
- */
-class CalendarComponent extends Component {
-
-	public $Controller = null;
-
-	public $monthList = [
-		'january', 'february', 'march', 'april', 'may', 'june', 'july', 'august', 'september', 'october', 'november', 'december'];
-
-	public $dayList = [
-		'mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun'
-	];
-
-	public $year = null;
-
-	public $month = null;
-
-	public $day = null;
-
-	/**
-	 * Startup controller
-	 *
-	 * @param object $Controller Controller instance
-	 * @return void
-	 */
-	public function startup(Controller $Controller) {
-		$this->Controller = $Controller;
-	}
-
-	/**
-	 * @return bool Success
-	 */
-	public function ensureCalendarConsistency($year, $month, $span = 10) {
-		if (!is_numeric($month)) {
-			$monthKeys = array_keys($this->monthList, $month);
-			$month = array_shift($monthKeys);
-			if ($month === null) {
-				$month = -1;
-			}
-		}
-
-		if (!$year || !$month) {
-			$year = date('Y');
-			$month = date('n');
-			$item = null;
-		}
-		$year = (int)$year;
-		$month = (int)$month;
-
-		$current = date('Y');
-
-		if (empty($month) || $year < $current - $span || $year > $current + $span) {
-			$this->Controller->Flash->error(__d('tools', 'invalid date'));
-			$this->Controller->redirect(['action' => 'index']);
-		}
-
-		$this->year = $year;
-		$this->month = $month;
-
-		if (empty($this->Controller->request->params['pass'])) {
-			return true;
-		}
-
-		if ($month < 1 || $month > 12) {
-			$this->Controller->Flash->error(__d('tools', 'invalid date'));
-			$this->Controller->redirect(['action' => 'index']);
-		}
-		return true;
-	}
-
-	public function year() {
-		return $this->year;
-	}
-
-	public function month($asString = false) {
-		return $this->month;
-	}
-
-	/**
-	 * Month as integer value 1..12 or 0 on error
-	 * february => 2
-	 */
-	public function retrieveMonth($string) {
-		if (empty($string)) {
-			return 0;
-		}
-		$string = mb_strtolower($string);
-		if (in_array($string, $this->monthList)) {
-			$keys = array_keys($this->monthList, $string);
-			return $keys[0] + 1;
-		}
-		return 0;
-	}
-
-	/**
-	 * Day as integer value 1..31 or 0 on error
-	 * february => 2
-	 */
-	public function retrieveDay($string, $month = null) {
-		if (empty($string)) {
-			return 0;
-		}
-		$string = (int)$string;
-		if ($string < 1 || $string > 31) {
-			return 0;
-		}
-
-		// check on month days!
-		return $string;
-
-		return 0;
-	}
-
-	public function months() {
-		return $this->monthList;
-	}
-
-	public function days() {
-		return $this->dayList;
-	}
-
-	/**
-	 * Converts integer to x-digit string
-	 * 1 => 01, 12 => 12
-	 */
-	public function asString($number, $digits = 2) {
-		$number = (string)$number;
-		$count = mb_strlen($number);
-		while ($count < $digits) {
-			$number = '0' . $number;
-			$count++;
-		}
-		return $number;
-	}
-
-}

+ 0 - 26
Test/Case/Controller/Component/CalendarComponentTest.php

@@ -1,26 +0,0 @@
-<?php
-
-App::uses('CalendarComponent', 'Tools.Controller/Component');
-App::uses('MyCakeTestCase', 'Tools.TestSuite');
-
-class CalendarComponentTest extends MyCakeTestCase {
-
-	public function setUp() {
-		parent::setUp();
-
-		$this->Calendar = new CalendarComponent(new ComponentCollection());
-	}
-
-	public function tearDown() {
-		parent::tearDown();
-	}
-
-	public function testObject() {
-		$this->assertInstanceOf('CalendarComponent', $this->Calendar);
-	}
-
-	public function testX() {
-		//TODO
-	}
-
-}

+ 2 - 2
Test/Case/Controller/Component/CommonComponentTest.php

@@ -56,8 +56,8 @@ class CommonComponentTest extends CakeTestCase {
 		// with plugin
 		$this->Controller->Calendar = null;
 		$this->assertTrue(!isset($this->Controller->Calendar));
-		$this->Controller->Common->loadComponent('Tools.Calendar');
-		$this->assertTrue(isset($this->Controller->Calendar));
+		$this->Controller->Common->loadComponent('Tools.Mobile');
+		$this->assertTrue(isset($this->Controller->Mobile));
 
 		// with options
 		$this->Controller->Test = null;