From 2f7a0e94cadfbc1ece3bd1d3ff23483b845cd420 Mon Sep 17 00:00:00 2001
From: Matt Perry <matt@mattperry.com>
Date: Tue, 10 Sep 2013 22:17:43 -0700
Subject: [PATCH] Fix CodeSniffer whitespace violoations
Removed extraneous whitespace to eliminate errors reported by the
Squiz.WhiteSpace.SuperfluousWhitespace sniff.
---
inc/RemoteAPICore.php | 1 -
inc/auth.php | 1 -
inc/fulltext.php | 1 -
inc/infoutils.php | 1 -
inc/parser/handler.php | 4 ----
inc/parser/metadata.php | 1 -
inc/parser/parser.php | 1 -
inc/parser/xhtml.php | 1 -
lib/plugins/acl/admin.php | 4 ----
lib/plugins/acl/style.css | 2 --
lib/plugins/config/settings/config.class.php | 2 --
lib/plugins/plugin/admin.php | 1 -
lib/plugins/plugin/classes/ap_info.class.php | 1 -
lib/plugins/popularity/action.php | 1 -
lib/plugins/revert/admin.php | 1 -
lib/plugins/syntax.php | 4 ++--
lib/plugins/usermanager/admin.php | 1 -
lib/scripts/linkwiz.js | 1 -
lib/scripts/textselection.js | 2 --
lib/tpl/dokuwiki/css/_forms.css | 1 -
lib/tpl/dokuwiki/css/_media_fullscreen.css | 1 -
21 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php
index 3a713baca..74c6689ac 100644
--- a/inc/RemoteAPICore.php
+++ b/inc/RemoteAPICore.php
@@ -333,7 +333,6 @@ class RemoteAPICore {
if (!is_array($options)) $options = array();
$options['skipacl'] = 0; // no ACL skipping for XMLRPC
-
if(auth_quickaclcheck($ns.':*') >= AUTH_READ) {
$dir = utf8_encodeFN(str_replace(':', '/', $ns));
diff --git a/inc/auth.php b/inc/auth.php
index 8be270bfc..36fc7d086 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -391,7 +391,6 @@ function auth_randombytes($length) {
}
}
-
// If no strong randoms available, try OS the specific ways
if(!$strong) {
// Unix/Linux platform
diff --git a/inc/fulltext.php b/inc/fulltext.php
index c03126994..bd8e6b866 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -395,7 +395,6 @@ function ft_snippet_re_preprocess($term) {
$BR = '\b';
}
-
if(substr($term,0,2) == '\\*'){
$term = substr($term,2);
}else{
diff --git a/inc/infoutils.php b/inc/infoutils.php
index 4c279e692..7358955a0 100644
--- a/inc/infoutils.php
+++ b/inc/infoutils.php
@@ -193,7 +193,6 @@ function check(){
msg('Valid locale '.hsc($loc).' found.', 1);
}
-
if($conf['allowdebug']){
msg('Debugging support is enabled. If you don\'t need it you should set $conf[\'allowdebug\'] = 0',-1);
}else{
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 6e6cca1a9..b72f051ae 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -618,7 +618,6 @@ function Doku_Handler_Parse_Media($match) {
// Split title from URL
$link = explode('|',$link,2);
-
// Check alignment
$ralign = (bool)preg_match('/^ /',$link[0]);
$lalign = (bool)preg_match('/ $/',$link[0]);
@@ -1341,7 +1340,6 @@ class Doku_Handler_Table {
break;
}
-
}
}
@@ -1368,7 +1366,6 @@ class Doku_Handler_Table {
break;
}
-
}
}
if (is_null($spanning_cell)) {
@@ -1403,7 +1400,6 @@ class Doku_Handler_Table {
}
}
-
// condense cdata
$cnt = count($this->tableCalls);
for( $key = 0; $key < $cnt; $key++){
diff --git a/inc/parser/metadata.php b/inc/parser/metadata.php
index 094c3ad05..437559370 100644
--- a/inc/parser/metadata.php
+++ b/inc/parser/metadata.php
@@ -292,7 +292,6 @@ class Doku_Renderer_metadata extends Doku_Renderer {
$id = $parts[0];
}
-
$default = $this->_simpleTitle($id);
// first resolve and clean up the $id
diff --git a/inc/parser/parser.php b/inc/parser/parser.php
index 3caad834a..e39a4daf5 100644
--- a/inc/parser/parser.php
+++ b/inc/parser/parser.php
@@ -807,7 +807,6 @@ class Doku_Parser_Mode_quotes extends Doku_Parser_Mode {
"\"",$mode,'doublequoteclosing'
);
-
}
function getSort() {
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index e269563fe..848afbd4f 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -737,7 +737,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
$link['class'] = 'media';
}
-
$link['title'] = $this->_xmlEntities($url);
$url = str_replace('\\','/',$url);
$url = 'file:///'.$url;
diff --git a/lib/plugins/acl/admin.php b/lib/plugins/acl/admin.php
index 50377da81..5ab73670d 100644
--- a/lib/plugins/acl/admin.php
+++ b/lib/plugins/acl/admin.php
@@ -61,7 +61,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
// fresh 1:1 copy without replacements
$AUTH_ACL = file($config_cascade['acl']['default']);
-
// namespace given?
if($INPUT->str('ns') == '*'){
$this->ns = '*';
@@ -386,7 +385,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
echo '<legend>'.$this->getLang('acl_mod').'</legend>';
}
-
echo $this->_html_checkboxes($current,empty($this->ns),'acl');
if(is_null($current)){
@@ -686,7 +684,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
if($acl_level > AUTH_EDIT) $acl_level = AUTH_EDIT;
}
-
$new_acl = "$acl_scope\t$acl_user\t$acl_level\n";
$new_config = $acl_config.$new_acl;
@@ -775,7 +772,6 @@ class admin_plugin_acl extends DokuWiki_Admin_Plugin {
$inlist = true;
}
-
echo '<select name="acl_t" class="edit">'.NL;
echo ' <option value="__g__" class="aclgroup"'.$gsel.'>'.$this->getLang('acl_group').':</option>'.NL;
echo ' <option value="__u__" class="acluser"'.$usel.'>'.$this->getLang('acl_user').':</option>'.NL;
diff --git a/lib/plugins/acl/style.css b/lib/plugins/acl/style.css
index d8f0b53f3..a53a03450 100644
--- a/lib/plugins/acl/style.css
+++ b/lib/plugins/acl/style.css
@@ -1,4 +1,3 @@
-
#acl__tree {
font-size: 90%;
width: 25%;
@@ -138,4 +137,3 @@
#acl_manager table tr:hover {
background-color: __background_alt__;
}
-
diff --git a/lib/plugins/config/settings/config.class.php b/lib/plugins/config/settings/config.class.php
index 182a4c65f..1d2173706 100644
--- a/lib/plugins/config/settings/config.class.php
+++ b/lib/plugins/config/settings/config.class.php
@@ -176,12 +176,10 @@ if (!class_exists('configuration')) {
for ($i=0; $i<count($matches); $i++) {
$value = $matches[$i][2];
-
// correct issues with the incoming data
// FIXME ... for now merge multi-dimensional array indices using ____
$key = preg_replace('/.\]\[./',CM_KEYMARKER,$matches[$i][1]);
-
// handle arrays
if(preg_match('/^array ?\((.*)\)/', $value, $match)){
$arr = explode(',', $match[1]);
diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php
index 72c58620d..3f019d5e2 100644
--- a/lib/plugins/plugin/admin.php
+++ b/lib/plugins/plugin/admin.php
@@ -65,7 +65,6 @@ class admin_plugin_plugin extends DokuWiki_Admin_Plugin {
// enable direct access to language strings
$this->setupLocale();
-
$fn = $INPUT->param('fn');
if (is_array($fn)) {
$this->cmd = key($fn);
diff --git a/lib/plugins/plugin/classes/ap_info.class.php b/lib/plugins/plugin/classes/ap_info.class.php
index dfeb52b9d..b3826b944 100644
--- a/lib/plugins/plugin/classes/ap_info.class.php
+++ b/lib/plugins/plugin/classes/ap_info.class.php
@@ -13,7 +13,6 @@ class ap_info extends ap_manage {
$component_list = $this->get_plugin_components($this->manager->plugin);
usort($component_list, array($this,'component_sort'));
-
foreach ($component_list as $component) {
if (($obj = &plugin_load($component['type'],$component['name'],false,true)) === null) continue;
diff --git a/lib/plugins/popularity/action.php b/lib/plugins/popularity/action.php
index f0cbb771b..9e2e78d11 100644
--- a/lib/plugins/popularity/action.php
+++ b/lib/plugins/popularity/action.php
@@ -35,7 +35,6 @@ class action_plugin_popularity extends Dokuwiki_Action_Plugin {
//Actually send it
$status = $this->helper->sendData( $this->helper->gatherAsString() );
-
if ( $status !== '' ){
//If an error occured, log it
io_saveFile( $this->helper->autosubmitErrorFile, $status );
diff --git a/lib/plugins/revert/admin.php b/lib/plugins/revert/admin.php
index b65472e4c..423d67449 100644
--- a/lib/plugins/revert/admin.php
+++ b/lib/plugins/revert/admin.php
@@ -120,7 +120,6 @@ class admin_plugin_revert extends DokuWiki_Admin_Plugin {
$recents = getRecents(0,$this->max_lines);
echo '<ul>';
-
$cnt = 0;
foreach($recents as $recent){
if($filter){
diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php
index 6aa403b61..8df5abb08 100644
--- a/lib/plugins/syntax.php
+++ b/lib/plugins/syntax.php
@@ -216,12 +216,12 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode {
global $conf; // definitely don't invoke "global $lang"
$path = DOKU_PLUGIN.$this->getPluginName().'/lang/';
-
+
$lang = array();
// don't include once, in case several plugin components require the same language file
@include($path.'en/lang.php');
if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php');
-
+
$this->lang = $lang;
$this->localised = true;
}
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 3dba5a86e..266a7dd64 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -342,7 +342,6 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
$autocomp = '';
}
-
echo "<tr $class>";
echo "<td><label for=\"$id\" >$label: </label></td>";
echo "<td>";
diff --git a/lib/scripts/linkwiz.js b/lib/scripts/linkwiz.js
index 875d4a995..f6ac9b032 100644
--- a/lib/scripts/linkwiz.js
+++ b/lib/scripts/linkwiz.js
@@ -237,7 +237,6 @@ var dw_linkwiz = {
link = ':' + link;
}
-
var so = link.length;
var eo = 0;
if(dw_linkwiz.val){
diff --git a/lib/scripts/textselection.js b/lib/scripts/textselection.js
index bd80e9341..26b4196f2 100644
--- a/lib/scripts/textselection.js
+++ b/lib/scripts/textselection.js
@@ -104,7 +104,6 @@ function getSelection(textArea) {
}
} while ((!before_finished || !selection_finished));
-
// count number of newlines in str to work around stupid IE selection bug
var countNL = function(str) {
var m = str.split("\r\n");
@@ -230,4 +229,3 @@ function insertAtCarret(textAreaID, text){
var selection = getSelection(txtarea);
pasteText(selection,text,{nosel: true});
}
-
diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index 4d3f2b97a..522f9ed4d 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -1,4 +1,3 @@
-
/* TODO: this file is not up to the best standards and will be fixed after an overhaul of the form code */
/**
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 28e347882..31b71897b 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -501,4 +501,3 @@
width: 100%;
max-width: none;
}
-
--
GitLab