Merge branch 'release/4.8.0'

Schlaefer · Nov 18, 2015 · 7c0d652 · 7c0d652
2 parents 78faa94 + 55250d3
commit 7c0d652
Show file tree

Hide file tree

Showing 45 changed files with 699 additions and 387 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,38 @@
+sudo: false
+
+notifications:
+  email: false
+
 language: php
 
+cache:
+  directories:
+   - $HOME/.composer/cache
+
 php:
   - 5.4
   - 5.5
-  - 5.6
 
 env:
-  - DB=mysql
-  - DB=pgsql
+  matrix:
+    - DB=mysql
+    - DB=pgsql
+  global:
+    - PHPCS=0
+
+matrix:
+  fast_finish: true
+
+  include:
+    - php: 5.6
+      env: PHPCS=1 DB=mysql
+    - php: 5.6
+      env: DB=pgsql
 
 before_script:
-  - composer install -d app -o
+  - composer self-update
+  - composer install -d app --prefer-dist -o
+  - sh -c "if [ '$PHPCS' = '1' ]; then app/Vendor/bin/phpcs --config-set installed_paths app/Vendor/cakephp/cakephp-codesniffer; fi"
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi"
   - chmod -R 777 ./app/tmp
@@ -71,6 +93,4 @@ before_script:
 
 script:
   - ./app/Console/cake testsuite app All --stderr
-
-notifications:
-  email: false
+  - sh -c "if [ '$PHPCS' = '1' ]; then app/Vendor/bin/phpcs --standard=app/Test/ruleset.xml --warning-severity=8 -p app/Controller app/Model app/Lib app/Test app/View app/Plugin; fi"
diff --git a/app/Config/bootstrap.php b/app/Config/bootstrap.php
@@ -220,7 +220,7 @@
  * Add additional buttons to editor
  * @td document in namespace
  */
-Configure::write('Saito.markItUp.nextCssId', 10);
+Configure::write('Saito.markItUp.nextCssId', 11);
 
 //= attach Saito event manager to Cake event manager
 App::uses('SaitoEventManager', 'Lib/Saito/Event');

diff --git a/app/Config/version.php b/app/Config/version.php
@@ -1,4 +1,4 @@
 <?php
-	Configure::write('Saito.v', '4.7.5');
+	Configure::write('Saito.v', '4.8.0');
 
 	Configure::write('Saito.saitoHomepage', 'http://saito.siezi.com');
diff --git a/app/Controller/AdminsController.php b/app/Controller/AdminsController.php
@@ -11,6 +11,14 @@ class AdminsController extends AppController {
 		public function admin_index() {
 		}
 
+		/**
+		 * Show PHP-info
+		 *
+		 * @return void
+		 */
+		public function admin_phpinfo() {
+		}
+
 		public function admin_logs() {
 			// order here is output order in frontend
 			$_logsToRead = ['error', 'debug'];

diff --git a/app/Controller/EntriesController.php b/app/Controller/EntriesController.php
@@ -692,8 +692,15 @@ public function beforeFilter() {
 			$this->Security->unlockedActions = ['preview', 'solve', 'view'];
 			$this->Auth->allow('feed', 'index', 'view', 'mix', 'update');
 
-			if ($this->request->action === 'index') {
-				$this->_setAutoRefreshTime();
+			switch ($this->request->action) {
+				case 'index':
+					$this->_setAutoRefreshTime();
+					break;
+				case 'add':
+				case 'edit':
+					if ($this->Components->enabled('Security')) {
+						$this->Components->disable('Security');
+					}
 			}
 
 			Stopwatch::stop('Entries->beforeFilter()');

diff --git a/app/Controller/SearchesController.php b/app/Controller/SearchesController.php
@@ -41,7 +41,10 @@ public function simple() {
 
 			// @todo pgsql
 			$db = $this->Entry->getDataSource();
+			// @codingStandardsIgnoreStart
+			// on 5.5 phpcs assumes this is the deprecated PHP MySQL extension
 			if (!($db instanceof Mysql)) {
+				// @codingStandardsIgnoreEnd
 				$this->redirect(['action' => 'advanced']);
 				return;
 			}

diff --git a/app/Plugin/BbcodeParser/Lib/Editor.php b/app/Plugin/BbcodeParser/Lib/Editor.php
@@ -56,6 +56,13 @@ public function getMarkupSet() {
 					'openWith' => '[spoiler]',
 					'closeWith' => '[/spoiler]'
 				],
+				'Quote' => [
+					'name' => "<i class='fa fa-quote-left'></i>",
+					'className' => 'btn-markItUp-Quote',
+					'title' => __('Cite'),
+					'openWith' => '[quote]',
+					'closeWith' => '[/quote]'
+				],
 				'separator',
 				'Link' => array(
 					'name' => "<i class='fa fa-link'></i>",

diff --git a/app/Plugin/BbcodeParser/Lib/Parser.php b/app/Plugin/BbcodeParser/Lib/Parser.php
@@ -54,7 +54,7 @@ class Parser extends \Saito\Markup\Parser {
 				'float' => [
 					'type' => 'replacement',
 					'title' => 'float',
-					'replacement' => '<div class="richtext-float">{param}</div>'
+					'replacement' => '<div class="clearfix"></div><div class="richtext-float">{param}</div>'
 				],
 				// email
 				'email' => [
@@ -120,6 +120,12 @@ class Parser extends \Saito\Markup\Parser {
 					'type' => 'class',
 					'title' => 'urlWithAttributes'
 				],
+				// quotes
+				'quote' => [
+					'type' => 'replacement',
+					'title' => 'quote',
+					'replacement' => '<blockquote>{param}</blockquote>'
+				]
 			],
 			'multimedia' => [
 				'embed' => [

diff --git a/app/Plugin/BbcodeParser/Test/Case/Lib/BbcodeParserTest.php b/app/Plugin/BbcodeParser/Test/Case/Lib/BbcodeParserTest.php
@@ -28,6 +28,13 @@ public function testBold() {
 			$this->assertTags($result, $expected);
 		}
 
+		public function testQuoteblock() {
+			$input = '[quote]foo bar[/quote]';
+			$expected = array('blockquote' => array(), 'foo bar', '/blockquote');
+			$result = $this->_Parser->parse($input);
+			$this->assertTags($result, $expected);
+		}
+
 		public function testEmphasis() {
 			$input = '[i]italic[/i]';
 			$expected = array('em' => array(), 'italic', '/em');
@@ -412,7 +419,9 @@ public function testFlash() {
 
 		public function testFloat() {
 			$expected = [
-				'div' => ['class' => 'richtext-float'],
+				['div' => ['class' => 'clearfix']],
+				'/div',
+				['div' => ['class' => 'richtext-float']],
 				'text',
 				'/div',
 				'more'
@@ -619,25 +628,25 @@ public function testExternalImage() {
 
 			// test for standard URIs
 			$input = '[img]http://localhost/img/macnemo.png[/img]';
-			$expected = '<img src="http://localhost/img/macnemo.png" alt="" />';
+			$expected = '<img src="http://localhost/img/macnemo.png" alt=""/>';
 			$result = $this->_Parser->parse($input);
 			$this->assertEquals($expected, $result);
 
 			// test for URIs without protocol
 			$input = '[img]/somewhere/macnemo.png[/img]';
-			$expected = '<img src="' . $this->_Helper->webroot . 'somewhere/macnemo.png" alt="" />';
+			$expected = '<img src="' . $this->_Helper->webroot . 'somewhere/macnemo.png" alt=""/>';
 			$result = $this->_Parser->parse($input);
 			$this->assertEquals($expected, $result);
 
 			// test scaling with 1 parameter
 			$input = '[img=50]http://localhost/img/macnemo.png[/img]';
-			$expected = '<img src="http://localhost/img/macnemo.png" width="50" alt="" />';
+			$expected = '<img src="http://localhost/img/macnemo.png" width="50" alt=""/>';
 			$result = $this->_Parser->parse($input);
 			$this->assertEquals($expected, $result);
 
 			// test scaling with 2 parameters
 			$input = '[img=50x100]http://localhost/img/macnemo.png[/img]';
-			$expected = '<img src="http://localhost/img/macnemo.png" width="50" height="100" alt="" />';
+			$expected = '<img src="http://localhost/img/macnemo.png" width="50" height="100" alt=""/>';
 			$result = $this->_Parser->parse($input);
 			$this->assertEquals($expected, $result);
 

diff --git a/app/Plugin/BbcodeParser/docs/help/eng/1-bbcodes.md b/app/Plugin/BbcodeParser/docs/help/eng/1-bbcodes.md
@@ -152,6 +152,8 @@ If activated `[embed]<URL>[/embed]` tries to embed the URL via [embed.ly](http:/
 
 ### Float ###
 
-	[float]content[/float]
+	[float]float this to the side[/float] main content
+	…
+	[float]another float[/float] main content
 
 Floats the content to the side.
diff --git a/app/Plugin/Embedly/Locale/deu/LC_MESSAGES/embedly.po b/app/Plugin/Embedly/Locale/deu/LC_MESSAGES/embedly.po
@@ -0,0 +1,2 @@
+msgid "plugin.embedly.contentLink"
+msgstr "Inhalt auf %s anschauen."
diff --git a/app/Plugin/Embedly/Locale/eng/LC_MESSAGES/embedly.po b/app/Plugin/Embedly/Locale/eng/LC_MESSAGES/embedly.po
@@ -0,0 +1,2 @@
+msgid "plugin.embedly.contentLink"
+msgstr "See this content on %s."
diff --git a/app/Plugin/Embedly/View/Helper/EmbedlyHelper.php b/app/Plugin/Embedly/View/Helper/EmbedlyHelper.php
@@ -52,6 +52,13 @@ public function embedly($string) {
 			}
 			$title .= $obj->title;
 			$out = $this->Html->link($title, $obj->url, ['escape' => $escape]);
+		} elseif ($obj->type === 'link' && isset($obj->url)) {
+			$title = __d(
+				'embedly',
+				'plugin.embedly.contentLink',
+				[$obj->provider_name]
+			);
+			$out = $this->Html->link($title, $obj->url);
 		}
 
 		return $out;

diff --git a/app/Plugin/M/Controller/MsController.php b/app/Plugin/M/Controller/MsController.php
@@ -23,6 +23,12 @@ public function beforeFilter() {
 			parent::beforeFilter();
 			$this->Auth->allow('index', 'manifest');
 
+			if ($this->request->action === 'clientLog') {
+				if ($this->Components->enabled('Security')) {
+					$this->Components->disable('Security');
+				}
+			}
+
 			Configure::write('Asset.timestamp', 'force');
 		}
 
@@ -37,6 +43,7 @@ public function clientLog() {
 			$this->autoRender = false;
 			if (isset($this->request->data['message'])) {
 				$message = $this->request->data['message'];
+				$message = substr($message, 0, 500);
 				echo CakeLog::error($message, 'mobile-client') ? 0 : 1;
 			} else {
 				echo 1;

diff --git a/app/Plugin/M/View/Layouts/plugin-m.ctp b/app/Plugin/M/View/Layouts/plugin-m.ctp
@@ -21,18 +21,10 @@
 		};
 	</script>
 	<?= $this->element('custom_html_header') ?>
-	<?php
-		if ($isDebug) {
-			// $requireJsScript = 'main-prod';
-			$requireJsScript = 'main';
-			echo $this->RequireJs->scriptTag($requireJsScript, ['jsUrl' => 'm/dev/js/']);
-			?>
-			<meta HTTP-EQUIV="Pragma" CONTENT="no-cache">
-			<meta HTTP-EQUIV="Expires" CONTENT="-1">
-		<?php
-		} else {
-			echo $this->Html->script('M.../dist/js.js');
-		} ?>
+  <?php if ($isDebug) { ?>
+    <meta HTTP-EQUIV="Pragma" CONTENT="no-cache">
+    <meta HTTP-EQUIV="Expires" CONTENT="-1">
+  <?php } ?>
 </head>
 <body>
 <div id="main">
@@ -43,5 +35,14 @@
 	</div>
 </div>
 <div id="card-bottom"></div>
+<?php
+if ($isDebug) {
+  // $requireJsScript = 'main-prod';
+  $requireJsScript = 'main';
+  echo $this->RequireJs->scriptTag($requireJsScript, ['jsUrl' => 'm/dev/js/']);
+} else {
+  echo $this->Html->script('M.../dist/js.js');
+}
+?>
 </body>
 </html>
diff --git a/app/Plugin/M/webroot/dist/common.css b/app/Plugin/M/webroot/dist/common.css
diff --git a/app/Plugin/M/webroot/dist/js.js b/app/Plugin/M/webroot/dist/js.js
diff --git a/app/Test/Case/Controller/AdminsControllerTest.php b/app/Test/Case/Controller/AdminsControllerTest.php
@@ -0,0 +1,38 @@
+<?php
+
+	class AdminsControllerTest extends \Saito\Test\ControllerTestCase {
+
+		public $fixtures = [
+			'app.bookmark',
+			'app.category',
+			'app.esevent',
+			'app.esnotification',
+			'app.entry',
+			'app.setting',
+			'app.user',
+			'app.user_block',
+			'app.user_ignore',
+			'app.user_online',
+			'app.user_read',
+			'app.upload',
+		];
+
+		public function testPhpInfoNotAllowedAnon() {
+			$this->setExpectedException('ForbiddenException');
+			$this->testAction('/admin/admins/phpinfo');
+		}
+
+		public function testPhpInfoNotAllowedUser() {
+			$this->generate('Admins');
+			$this->_loginUser(3);
+			$this->setExpectedException('ForbiddenException');
+			$this->testAction('/admin/admins/phpinfo');
+		}
+
+		public function testPhpInfo() {
+			$this->generate('Admins');
+			$this->_loginUser(1);
+			$this->testAction('/admin/admins/phpinfo');
+		}
+
+	}
diff --git a/app/Test/ruleset.xml b/app/Test/ruleset.xml
@@ -1,9 +1,21 @@
 <?xml version="1.0"?>
 <ruleset name="Saito">
-    <!-- include all CakePHP rules -->
-    <rule ref="CakePHP">
-        <!-- excludes "docblocks must have 0 indent"-rule -->
-        <exclude name="CakePHP.WhiteSpace.ScopeIndent"/>
-    </rule>
-    <rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
-</ruleset>
+  <exclude-pattern>app/Test/Selenium</exclude-pattern>
+  <exclude-pattern>app/View/Themed</exclude-pattern>
+  <exclude-pattern>app/Plugin/Embedly</exclude-pattern>
+  <exclude-pattern>app/Plugin/Geshi</exclude-pattern>
+  <exclude-pattern>app/Plugin/FileUpload</exclude-pattern>
+  <exclude-pattern>app/Plugin/Install</exclude-pattern>
+  <exclude-pattern>app/Plugin/Markitup</exclude-pattern>
+  <exclude-pattern>app/Plugin/SaitoHelp/Vendor</exclude-pattern>
+  <exclude-pattern>app/Plugin/Search</exclude-pattern>
+  <exclude-pattern>app/Plugin/SimpleCaptcha</exclude-pattern>
+  <exclude-pattern>*/webroot/*</exclude-pattern>
+
+  <!-- include all CakePHP rules -->
+  <rule ref="CakePHP">
+    <!-- excludes "docblocks must have 0 indent"-rule -->
+    <exclude name="CakePHP.WhiteSpace.ScopeIndent"/>
+  </rule>
+  <rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
+</ruleset>
diff --git a/app/View/Admins/admin_index.ctp b/app/View/Admins/admin_index.ctp
@@ -11,6 +11,11 @@
 			__('admin.sysInfo.cce', $this->Admin->badge(Cache::settings('_cake_core_')['engine'], '_cBadge')),
 			__('admin.sysInfo.cse', $this->Admin->badge(Cache::settings('default')['engine'], '_cBadge'))
 		];
+		$si[] = $this->Html->link(
+			__('PHP Info'),
+			['controller' => 'admins', 'action' => 'phpinfo', 'prefix' => 'admin']
+		);
+
 		echo $this->Html->nestedList($si)
 	?>
 </div>
@@ -19,4 +24,4 @@
 	$this->Html->link(__('Empty Caches'),
 			['controller' => 'tools', 'action' => 'emptyCaches', 'admin' => true],
 			['class' => 'btn'])
-?>
+?>
diff --git a/app/View/Admins/admin_phpinfo.ctp b/app/View/Admins/admin_phpinfo.ctp
@@ -0,0 +1,15 @@
+<?php
+
+	$this->Html->addCrumb(__('admin.sysInfo.h'), '/admin');
+	$this->Html->addCrumb(__('PHP Info'), '/admin/admins/phpinfo');
+
+	echo $this->Html->tag('h1', __('PHP Info'));
+
+	ob_start();
+	phpinfo();
+	$info = ob_get_clean();
+	if (preg_match('/\<body\>(?P<body>.*)\<\/body\>/is', $info, $matches)) {
+		$body = $matches['body'];
+		$body = str_replace('<table ', '<table class="table table-striped table-bordered" ', $body);
+		echo $body;
+	}