diff --git a/inc/RemoteAPICore.php b/inc/RemoteAPICore.php index 3a713bacad2f00004b8b2ecc5ccdf36031351a74..74c6689acf397e056bbf48455412003ab91bc5f3 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 8be270bfcd32c271ee87199e638eb81feb14dda7..36fc7d0865e38ebbeb84dfa6c935449c59f8ca21 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 c03126994c66f616434c7cc6552a99e51d0e4b6f..bd8e6b866c7287d35ef31046617a230ec730f2bd 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 4c279e692f0dc26b622f4fbf84affd7bc5f89c9c..7358955a024d3681300a5b0f9e8cc50f6b86df91 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 6e6cca1a94e8777a03986aaee955e634b9973444..b72f051ae7baaf2864538afb8c791f4de064d68d 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 094c3ad0551096ff6e8c4eb8317c3c889867733d..437559370e248d61cee1aad6f0c961049bd03529 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 3caad834adbd82de1e3085f1e974935d61b412ea..e39a4daf52318f36e7598964067c002f4a9440ce 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 e269563fe34b6761d615504f61e647ee4099d624..848afbd4f24a73d72a6ac7cacac63d78f57e02f9 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 50377da816e5b23e7c25ffcd4603cb0819cbbe58..5ab73670d7efbb1dca7de562e295ba7302bb5f42 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 d8f0b53f37d424235526352288f53808fe80573e..a53a03450cc7e82a3de156edeab61229f87cff06 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 182a4c65f4959ddef003465f7d3a38ffb3ab09e5..1d2173706d3dbab33867579547348241a90d0495 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 72c58620d9ce4e7ecf918c465b5aa35c0d6f6bd8..3f019d5e2002e895519249147becad0369e86f21 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 dfeb52b9dbd133162cf04dc2a50d0d96e9ee1ec7..b3826b9447635ede2d5865905988169907c2324f 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 f0cbb771bec6943f570b44e46dc46223dc41f7b7..9e2e78d11b55c84ee9992ea1adc8ee186a20c160 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 b65472e4cdf6900062dd9388a129928d2001e8ae..423d67449715db114e7d591dc0e6f417c9ca024f 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 6aa403b61edec89b51ac6630084979462659adef..8df5abb080976f3506fe7525b9c507d9498f507e 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 3dba5a86edeeab744080e9750101aa83f78b040b..266a7dd6464abe53baff5f0ae703ba0819b2aa04 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 875d4a995bff8686108d4d34dcec581bf9a4b2f3..f6ac9b032008225a58da5c20a70fd46084665b2a 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 bd80e9341703253b8131a51c2a6e1ad9ac561ac0..26b4196f2632606f0f9badda956c5a9515733fce 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 4d3f2b97afcb9bedda515075ad52689f00274ff2..522f9ed4d0596cca570b4e14036bd9f8ff16f677 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 28e347882ecbed8773af0c38170a32300a0c88d8..31b71897bf138ba29d4fe28448c767cfd3fc8c41 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; } -