From 2f7a0e94cadfbc1ece3bd1d3ff23483b845cd420 Mon Sep 17 00:00:00 2001 From: Matt Perry Date: Tue, 10 Sep 2013 22:17:43 -0700 Subject: 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 ''.$this->getLang('acl_mod').''; } - 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 '