diff --git a/docs/code_style.md b/docs/code_style.md index dfa475e..fcf643d 100644 --- a/docs/code_style.md +++ b/docs/code_style.md @@ -251,10 +251,8 @@ switch ($this->phpType) { ~~~ * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ */ diff --git a/framework/console/controllers/MigrateController.php b/framework/console/controllers/MigrateController.php index 59dcb3f..aec198c 100644 --- a/framework/console/controllers/MigrateController.php +++ b/framework/console/controllers/MigrateController.php @@ -1,10 +1,8 @@ * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ */ diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php index de56e14..43c3059 100644 --- a/framework/db/ActiveQuery.php +++ b/framework/db/ActiveQuery.php @@ -1,10 +1,8 @@ * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ */ diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php index 9ec1fac..aaa9200 100644 --- a/framework/db/ActiveRecord.php +++ b/framework/db/ActiveRecord.php @@ -1,10 +1,8 @@ * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ */ diff --git a/framework/db/ActiveRelation.php b/framework/db/ActiveRelation.php index 54c6c62..e1793bd 100644 --- a/framework/db/ActiveRelation.php +++ b/framework/db/ActiveRelation.php @@ -1,10 +1,8 @@ * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ */ diff --git a/framework/db/ColumnSchema.php b/framework/db/ColumnSchema.php index 44e6cb0..ffdafd4 100644 --- a/framework/db/ColumnSchema.php +++ b/framework/db/ColumnSchema.php @@ -1,9 +1,7 @@ * @link http://www.yiiframework.com/ * @copyright Copyright © 2008-2011 Yii Software LLC diff --git a/framework/util/mimeTypes.php b/framework/util/mimeTypes.php index 87295f8..ffdba4b 100644 --- a/framework/util/mimeTypes.php +++ b/framework/util/mimeTypes.php @@ -6,7 +6,7 @@ * according to file extension names. * * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008 Yii Software LLC + * @copyright Copyright (c) 2008 Yii Software LLC * @license http://www.yiiframework.com/license/ * @since 2.0 */ diff --git a/framework/validators/BooleanValidator.php b/framework/validators/BooleanValidator.php index acf79be..427fa44 100644 --- a/framework/validators/BooleanValidator.php +++ b/framework/validators/BooleanValidator.php @@ -1,9 +1,7 @@ * @link http://www.yiiframework.com/ * @copyright Copyright © 2008-2011 Yii Software LLC diff --git a/framework/web/CacheSession.php b/framework/web/CacheSession.php index 23938f3..25524a0 100644 --- a/framework/web/CacheSession.php +++ b/framework/web/CacheSession.php @@ -1,9 +1,7 @@ * @link http://www.yiiframework.com/ * @copyright Copyright © 2008-2011 Yii Software LLC diff --git a/framework/web/Request.php b/framework/web/Request.php index a4a1fb9..65a7f30 100644 --- a/framework/web/Request.php +++ b/framework/web/Request.php @@ -1,9 +1,7 @@ * @link http://www.yiiframework.com/ * @copyright Copyright © 2008-2011 Yii Software LLC diff --git a/framework/web/Theme.php b/framework/web/Theme.php deleted file mode 100644 index 22fe608..0000000 --- a/framework/web/Theme.php +++ /dev/null @@ -1,141 +0,0 @@ - - * @link http://www.yiiframework.com/ - * @copyright Copyright © 2008-2011 Yii Software LLC - * @license http://www.yiiframework.com/license/ - */ - -/** - * CTheme represents an application theme. - * - * @property string $name Theme name. - * @property string $baseUrl The relative URL to the theme folder (without ending slash). - * @property string $basePath The file path to the theme folder. - * @property string $viewPath The path for controller views. Defaults to 'ThemeRoot/views'. - * @property string $systemViewPath The path for system views. Defaults to 'ThemeRoot/views/system'. - * @property string $skinPath The path for widget skins. Defaults to 'ThemeRoot/views/skins'. - * - * @author Qiang Xue - * @version $Id$ - * @package system.web - * @since 1.0 - */ -class CTheme extends CComponent -{ - private $_name; - private $_basePath; - private $_baseUrl; - - /** - * Constructor. - * @param string $name name of the theme - * @param string $basePath base theme path - * @param string $baseUrl base theme URL - */ - public function __construct($name,$basePath,$baseUrl) - { - $this->_name=$name; - $this->_baseUrl=$baseUrl; - $this->_basePath=$basePath; - } - - /** - * @return string theme name - */ - public function getName() - { - return $this->_name; - } - - /** - * @return string the relative URL to the theme folder (without ending slash) - */ - public function getBaseUrl() - { - return $this->_baseUrl; - } - - /** - * @return string the file path to the theme folder - */ - public function getBasePath() - { - return $this->_basePath; - } - - /** - * @return string the path for controller views. Defaults to 'ThemeRoot/views'. - */ - public function getViewPath() - { - return $this->_basePath.DIRECTORY_SEPARATOR.'views'; - } - - /** - * @return string the path for system views. Defaults to 'ThemeRoot/views/system'. - */ - public function getSystemViewPath() - { - return $this->getViewPath().DIRECTORY_SEPARATOR.'system'; - } - - /** - * @return string the path for widget skins. Defaults to 'ThemeRoot/views/skins'. - * @since 1.1 - */ - public function getSkinPath() - { - return $this->getViewPath().DIRECTORY_SEPARATOR.'skins'; - } - - /** - * Finds the view file for the specified controller's view. - * @param CController $controller the controller - * @param string $viewName the view name - * @return string the view file path. False if the file does not exist. - */ - public function getViewFile($controller,$viewName) - { - $moduleViewPath=$this->getViewPath(); - if(($module=$controller->getModule())!==null) - $moduleViewPath.='/'.$module->getId(); - return $controller->resolveViewFile($viewName,$this->getViewPath().'/'.$controller->getUniqueId(),$this->getViewPath(),$moduleViewPath); - } - - /** - * Finds the layout file for the specified controller's layout. - * @param CController $controller the controller - * @param string $layoutName the layout name - * @return string the layout file path. False if the file does not exist. - */ - public function getLayoutFile($controller,$layoutName) - { - $moduleViewPath=$basePath=$this->getViewPath(); - $module=$controller->getModule(); - if(empty($layoutName)) - { - while($module!==null) - { - if($module->layout===false) - return false; - if(!empty($module->layout)) - break; - $module=$module->getParentModule(); - } - if($module===null) - $layoutName=\Yii::$app->layout; - else - { - $layoutName=$module->layout; - $moduleViewPath.='/'.$module->getId(); - } - } - else if($module!==null) - $moduleViewPath.='/'.$module->getId(); - - return $controller->resolveViewFile($layoutName,$moduleViewPath.'/layouts',$basePath,$moduleViewPath); - } -} diff --git a/framework/web/UrlManager.php b/framework/web/UrlManager.php index 8849d7e..e736cc6 100644 --- a/framework/web/UrlManager.php +++ b/framework/web/UrlManager.php @@ -1,9 +1,7 @@