diff --git a/.gitignore b/.gitignore index 08302b4..43bef57 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ demos #www/images/programs workspace.xml *.secret -.idea/ \ No newline at end of file +.idea/ +runtime/ diff --git a/www/css/styles.css b/www/css/styles.css index e68ffd0..eb099a1 100644 --- a/www/css/styles.css +++ b/www/css/styles.css @@ -693,16 +693,6 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu { font-weight: 900; } -/* disqus --------------------------------------------------- */ - -.disqus_owner { - border-radius: 6px; - border: 1px solid #D7E0E2; - padding: 10px; - background-color: #ECF0F1; -} - /* blog/view -------------------------------------------------- */ diff --git a/www/index-test.php b/www/index-test.php deleted file mode 100644 index 99e6f69..0000000 --- a/www/index-test.php +++ /dev/null @@ -1,58 +0,0 @@ -\n"; -echo "\n
\n"; -echo "File: " . __FILE__ . "
\n"; -echo "[C] Time: " . date("F d Y H:i:s.", filectime(__FILE__)) . "
\n"; -echo "[M] Time: " . date("F d Y H:i:s.", filemtime(__FILE__)) . "
\n"; -echo "[MD5] File: " . md5_file (__FILE__) . "
\n"; -echo "\n
\n"; -echo "POST:" . print_r($_POST, true); -echo "\n
\n"; -echo "GET:" . print_r($_GET, true); -echo "\n
\n"; -echo dirname(__FILE__); -echo "\n
\n"; -echo dirname(__FILE__) . '/../framework/yii.php'; -echo "\n
\n"; -echo dirname(__FILE__) . '/protected/config/main.php'; -echo "\n
\n"; -print_r( scandir("/") ); -echo "\n
\n"; -print_r( scandir(".") ); -echo "\n
\n"; -print_r( scandir(dirname(__FILE__)) ); -echo "\n
\n"; -print_r( scandir(dirname(__FILE__) . '/protected/') ); -echo "\n
\n"; -print_r( scandir(dirname(__FILE__) . '/protected/controllers/') ); -echo "\n
\n"; -print_r( scandir('/mnt/web1/e3/60/51559660/htdocs/www/protected/controllers/') ); -echo "\n
\n"; -print_r( scandir('/') ); -echo "\n
\n"; -print_r( scandir('/../') ); -echo "\n
\n"; -print_r( scandir('/../framework/') ); -echo "\n
\n"; -/*?*/ echo ( is_file('/mnt/web1/e3/60/51559660/htdocs/www/protected/controllers/MsmainController.php') ? 'true' : 'false' ) . "
\n"; -/*-*/ echo ( is_file('/mnt/web1/e3/60/51559660/htdocs/www/protected/controllers/MSMainController.php') ? 'true' : 'false' ) . "
\n"; -/*-*/ echo ( is_file('/protected/controllers/MSMainController.php') ? 'true' : 'false' ) . "
\n"; -/*+*/ echo ( is_file('protected/controllers/MSMainController.php') ? 'true' : 'false' ) . "
\n"; -/*-*/ echo ( is_file('/www/protected/controllers/MSMainController.php') ? 'true' : 'false' ) . "
\n"; -/*+*/ echo ( is_file('protected/controllers/MSMainController.php') ? 'true' : 'false' ) . "
\n"; -/*+*/ echo ( is_file(dirname(__FILE__) . '/protected/controllers/MSMainController.php') ? 'true' : 'false' ) . "
\n"; -echo "\n
\n"; -print_r( scandir(dirname(__FILE__) . '/protected/views/') ); -echo "\n
\n"; - -// change the following paths if necessary -$yii= dirname(__FILE__) . '/../framework/yii.php'; -$config= dirname(__FILE__) . '/protected/config/main.php'; - -// remove the following lines when in production mode -defined('YII_DEBUG') or define('YII_DEBUG',true); -// dev or prod - merges settings with respective file -defined('YII_CUSTOM_ENV') or define('YII_CUSTOM_ENV', 'prod'); - -require_once($yii); -Yii::createWebApplication($config)->run(); \ No newline at end of file diff --git a/www/protected/components/MsHelper.php b/www/protected/components/MsHelper.php index c79ded9..970c27f 100644 --- a/www/protected/components/MsHelper.php +++ b/www/protected/components/MsHelper.php @@ -104,7 +104,7 @@ class MsHelper { * @param $after * @return mixed */ - public function encloseLines($input, $before, $after) + public static function encloseLines($input, $before, $after) { $array = preg_split("/\r\n|\n|\r/", $input); diff --git a/www/protected/extensions/YiiDisqusWidget/.gitignore b/www/protected/extensions/YiiDisqusWidget/.gitignore deleted file mode 100644 index 710d905..0000000 --- a/www/protected/extensions/YiiDisqusWidget/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -.orig -.orig.* -.chg.* -.rej -.conflict~ -.idea/ -nbproject/ -.DS_Store - -!.gitignore -assets/ -protected/runtime/ -themes/classic/views/ \ No newline at end of file diff --git a/www/protected/extensions/YiiDisqusWidget/LICENSE b/www/protected/extensions/YiiDisqusWidget/LICENSE deleted file mode 100644 index c76ac1f..0000000 --- a/www/protected/extensions/YiiDisqusWidget/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2013, Anton Kucherov -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, this - list of conditions and the following disclaimer in the documentation and/or - other materials provided with the distribution. - - Neither the name of the {organization} nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/www/protected/extensions/YiiDisqusWidget/README.md b/www/protected/extensions/YiiDisqusWidget/README.md deleted file mode 100644 index f6dce8f..0000000 --- a/www/protected/extensions/YiiDisqusWidget/README.md +++ /dev/null @@ -1,48 +0,0 @@ -YiiDisqusWidget -=============== - -This is sample widget wich can help you to add DISQUS -support in to your Yii site. - -##Requirements - -You must be registered on [DISQUS](http://disqus.com/) - -##Installation - -Copy `YiiDisqusWidget` folder in you `protected/extensions` folder. - -##Usage - -Just add this code on your page where you need to include DISQUS. -Simple usage: -```php -// DISQUS_SHORTNAME - You disqus_shortname from DISQUS. -$this->widget('ext.YiiDisqusWidget.YiiDisqusWidget',array('shortname'=>'DISQUS_SHORTNAME')); -``` - -You can change all off `disqus_` parameters in options array: -```javascript -var disqus_shortname; -var disqus_identifier; -var disqus_title; -var disqus_url; -``` -Just add it in option array: -```php -$this->widget( - 'ext.YiiDisqusWidget.YiiDisqusWidget', - array( - 'shortname' => 'DISQUS_SHORTNAME', - 'identifier' => 'DISQUS_IDENTIFIER', - 'title' => 'DISQUS_TITLE', - 'url' => 'DISQUS_URL', - 'category_id' => 'DISQUS_CATEGORY_ID', - ) -); -``` -More information about DISQUS variables on [http://help.disqus.com/](http://help.disqus.com/customer/portal/articles/472098-javascript-configuration-variables#disqus_shortname) - -##Resources - - * [GitHub](https://github.com/DexterHD/YiiDisqusWidget) diff --git a/www/protected/extensions/YiiDisqusWidget/YiiDisqusWidget.php b/www/protected/extensions/YiiDisqusWidget/YiiDisqusWidget.php deleted file mode 100644 index f46e74d..0000000 --- a/www/protected/extensions/YiiDisqusWidget/YiiDisqusWidget.php +++ /dev/null @@ -1,56 +0,0 @@ - -* @link http://idexter.ru/ -* @copyright 2013 idexter.ru -*/ - -/** - * YiiDisqusWidget - * @author Anton Kucherov - */ -class YiiDisqusWidget extends CWidget -{ - /** - * @var string disqus_shortname - */ - public $shortname; - /** - * @var string disqus_identifier - */ - public $identifier; - /** - * @var string disqus_title - */ - public $title; - /** - * @var string disqus_url - */ - public $url; - /** - * @var string disqus_category_id - */ - public $category_id; - - /** - * @throws CHttpException - */ - public function init() - { - parent::init(); - if (empty($this->shortname)) { - throw new CHttpException(500, Yii::t('YiiDisqusWidget', 'Parameter "disqus_shortname" is not set')); - } - - $params = array(); - $params['shortname'] = $this->shortname; - $params['identifier'] = $this->identifier; - $params['title'] = $this->title; - $params['url'] = $this->url; - $params['category_id'] = $this->category_id; - - $this->render('yiidisqus',$params); - } -} \ No newline at end of file diff --git a/www/protected/extensions/YiiDisqusWidget/views/yiidisqus.php b/www/protected/extensions/YiiDisqusWidget/views/yiidisqus.php deleted file mode 100644 index 87f9347..0000000 --- a/www/protected/extensions/YiiDisqusWidget/views/yiidisqus.php +++ /dev/null @@ -1,39 +0,0 @@ - - * @link http://idexter.ru/ - * @copyright 2013 idexter.ru - */ -?> -
- - -comments powered by Disqus \ No newline at end of file diff --git a/www/protected/views/blogpost/view.php b/www/protected/views/blogpost/view.php index adcafa8..e7a93fb 100644 --- a/www/protected/views/blogpost/view.php +++ b/www/protected/views/blogpost/view.php @@ -30,19 +30,4 @@ $this->breadcrumbs = array( -
- widget( - 'ext.YiiDisqusWidget.YiiDisqusWidget', - [ - 'shortname' => 'mikescher-de', - 'identifier' => 'blog/view/' + $model->ID, - 'title' => $model->Title, - 'url' => $model->getAbsoluteLink(), - 'category_id' => '3253401', // = blog/view - ] - ); - ?> -
- diff --git a/www/protected/views/blogpost/view_BFJoustBot.php b/www/protected/views/blogpost/view_BFJoustBot.php index 2db9727..f032eae 100644 --- a/www/protected/views/blogpost/view_BFJoustBot.php +++ b/www/protected/views/blogpost/view_BFJoustBot.php @@ -77,19 +77,4 @@ array_push($this->css_files, '/css/blogpost_BFJoustBot_style.css'); -
- widget( - 'ext.YiiDisqusWidget.YiiDisqusWidget', - [ - 'shortname' => 'mikescher-de', - 'identifier' => 'blog/view/' + $model->ID, - 'title' => $model->Title, - 'url' => $model->getAbsoluteLink(), - 'category_id' => '3253401', // = blog/view - ] - ); - ?> -
- diff --git a/www/protected/views/blogpost/view_ProjectEulerBefunge.php b/www/protected/views/blogpost/view_ProjectEulerBefunge.php index c5f58d8..5243d83 100644 --- a/www/protected/views/blogpost/view_ProjectEulerBefunge.php +++ b/www/protected/views/blogpost/view_ProjectEulerBefunge.php @@ -150,19 +150,4 @@ array_push($this->css_files, "/css/blogpost_ProjectEulerBefunge_style.css"); -
- widget( - 'ext.YiiDisqusWidget.YiiDisqusWidget', - [ - 'shortname' => 'mikescher-de', - 'identifier' => 'blog/view/' + $model->ID, - 'title' => $model->Title, - 'url' => $model->getAbsoluteLink(), - 'category_id' => '3253401', // = blog/view - ] - ); - ?> -
- diff --git a/www/protected/views/msmain/admin.php b/www/protected/views/msmain/admin.php index ae93c80..93e1630 100644 --- a/www/protected/views/msmain/admin.php +++ b/www/protected/views/msmain/admin.php @@ -160,7 +160,7 @@ array_push($this->js_files, '/javascript/msmain_admin_script.js');