zikula / core

tools/bootstrapify.php

Spacing +10 added lines, -10 removed lines

@@ -33,12 +33,12 @@ 
         
         // validateInputArgument
         if (empty($argv[1])) {
-            echo 'Usage: '.$argv[0].' [/path/to/module_or_theme_or_file]'.PHP_EOL;
+            echo 'Usage: ' . $argv[0] . ' [/path/to/module_or_theme_or_file]' . PHP_EOL;
             die();
         }
         
         $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($argv[1]), RecursiveIteratorIterator::SELF_FIRST);
-        foreach($objects as $name => $object) {
+        foreach ($objects as $name => $object) {
             if (strpos($name, '.svn/') === false && strpos($name, '.git/') === false) {
                                 
                 $filename = realpath($name);
@@ -77,7 +77,7 @@ 
                     'gap'
                 );
                 foreach ($replace as  $value) {
-                    $content = str_replace('z-'.$value, $value, $content);
+                    $content = str_replace('z-' . $value, $value, $content);
                 }
 
                  
@@ -113,7 +113,7 @@ 
         $content = $matches[1];
         $content = str_replace('<h3>', '', $content);
         $content = str_replace('</h3>', '', $content);
-        return '<h3>'.$content.'</h3>';
+        return '<h3>' . $content . '</h3>';
 
     }
     
@@ -126,7 +126,7 @@ 
      */  
     function formCallback1($matches)
     {
-        return '<div class="form-group">'.$matches[1].'<label class="col-sm-3 control-label"'.$matches[2].'</label>'.$matches[1].'<div class="col-sm-9">';
+        return '<div class="form-group">' . $matches[1] . '<label class="col-sm-3 control-label"' . $matches[2] . '</label>' . $matches[1] . '<div class="col-sm-9">';
 
     }
     
@@ -139,7 +139,7 @@ 
      */  
     function formCallback2($matches)
     {
-        return '</div>'."\n".$matches[1].'</div>'."\n".$matches[1].'</fieldset>';
+        return '</div>' . "\n" . $matches[1] . '</div>' . "\n" . $matches[1] . '</fieldset>';
 
     }
     
@@ -152,7 +152,7 @@ 
      */  
     function formCallback3($matches)
     {        
-        return '</div>'."\n".$matches[3].'<div id="'.$matches[1].'">'."\n".$matches[3].'<div class="form-group">';
+        return '</div>' . "\n" . $matches[3] . '<div id="' . $matches[1] . '">' . "\n" . $matches[3] . '<div class="form-group">';
     }
     
     /**
@@ -164,7 +164,7 @@ 
      */    
     function formCallback4($matches)
     {
-        return '</div>'."\n".$matches[1].'</div>'."\n".$matches[1].'<div class="form-group">';
+        return '</div>' . "\n" . $matches[1] . '</div>' . "\n" . $matches[1] . '<div class="form-group">';
     }
 
     /**
@@ -182,7 +182,7 @@ 
         $content = str_replace('type="password"', 'type="text" class="form-control"', $content);
         $content = str_replace('<select', '<select class="form-control"', $content);   
         
-        return '<form class="form'.$content.'</form>';
+        return '<form class="form' . $content . '</form>';
     }
     
     
@@ -199,7 +199,7 @@ 
         $content = str_replace('<a', '    <a class="btn btn-default"', $content);
         $content = str_replace('{button', '    {button', $content);   
         
-        return '<div class="form-group">'."\n".'            <div class="col-sm-offset-3 col-sm-9">'.$content.'    </div>'."\n".'        </div>';
+        return '<div class="form-group">' . "\n" . '            <div class="col-sm-offset-3 col-sm-9">' . $content . '    </div>' . "\n" . '        </div>';
     }
 }
 

tools/recoveryconsole/zrc.php

Indentation +30 added lines, -30 removed lines

@@ -935,9 +935,9 @@ 
     {
         // Assemble the markup.
         $console = $this->markupHeader()
-                 . $this->markupMenu()
-                 . $this->markupBodyContent()
-                 . $this->markupFooter();
+                    . $this->markupMenu()
+                    . $this->markupBodyContent()
+                    . $this->markupFooter();
         // A single print is used in the class.
         return print $console;
     }
@@ -1009,18 +1009,18 @@ 
     {
         // Array of explanatoty defines, keyed by operations.
         $explanations = array('theme'         => __('<strong>INSTRUCTIONS:</strong> Use this utility to recover from theme-related fatal errors or to reset user-specified themes.'),
-                              'permission'    => __('<strong>INSTRUCTIONS:</strong> Use this utility to reset your site permissions to the default state that was set when you originally installed the site.  Carefully review the chart below as an example of how your permissions will be setup after running this utility.'),
-                              'block'         => __('<strong>INSTRUCTIONS:</strong> Use this utility to disable or delete blocks that you believe are causing issues for your site. Blocks that you disable can still be accessed by the system, but a deleted block is gone for good; double-check your choices before running this utility.  If there are no blocks present on your site, this utility will be disabled.'),
-                              'site'          => __('<strong>INSTRUCTIONS:</strong> Use this utility to turn on your previously disabled site.'),
-                              'password'      => __('<strong>INSTRUCTIONS:</strong> Use this utility to reset your admin (or other) password.'),
-                              'tempdir'       => __('<strong>INSTRUCTIONS:</strong> Use this utility to rebuild your temp directory in case you accidentally deleted it or it is corrupted.'),
-                              'outputfilter'  => __('<strong>INSTRUCTIONS:</strong> Use this utility to reset the output filter to \'internal\'. Useful if there is something wrong with the output filters in use (eg. HTMLPurifier).'),
-                              'phpids'        => __('<strong>INSTRUCTIONS:</strong> Use this utility to disable PHPIDS. Useful if your settings in PHPIDS crashed the entire system.'),
-                              'about'         => __('About')
+                                'permission'    => __('<strong>INSTRUCTIONS:</strong> Use this utility to reset your site permissions to the default state that was set when you originally installed the site.  Carefully review the chart below as an example of how your permissions will be setup after running this utility.'),
+                                'block'         => __('<strong>INSTRUCTIONS:</strong> Use this utility to disable or delete blocks that you believe are causing issues for your site. Blocks that you disable can still be accessed by the system, but a deleted block is gone for good; double-check your choices before running this utility.  If there are no blocks present on your site, this utility will be disabled.'),
+                                'site'          => __('<strong>INSTRUCTIONS:</strong> Use this utility to turn on your previously disabled site.'),
+                                'password'      => __('<strong>INSTRUCTIONS:</strong> Use this utility to reset your admin (or other) password.'),
+                                'tempdir'       => __('<strong>INSTRUCTIONS:</strong> Use this utility to rebuild your temp directory in case you accidentally deleted it or it is corrupted.'),
+                                'outputfilter'  => __('<strong>INSTRUCTIONS:</strong> Use this utility to reset the output filter to \'internal\'. Useful if there is something wrong with the output filters in use (eg. HTMLPurifier).'),
+                                'phpids'        => __('<strong>INSTRUCTIONS:</strong> Use this utility to disable PHPIDS. Useful if your settings in PHPIDS crashed the entire system.'),
+                                'about'         => __('About')
                                                 .__('<strong>VERSION</strong><br />This is <strong>Version '.self::VERSION.'</strong> of the <strong>Zikula Recovery Console</strong><br /><br />')
                                                 .__('<strong>LICENSE</strong><br /><a href="http://www.gnu.org/copyleft/gpl.html" title="General Public License">General Public License</a><br /><br />')
                                                 .__('<strong>CREDITS</strong><br />Maintained and enhanced by the Zikula CoreDev team. Originally developed by <a href="http://www.alarconcepts.com/" title="John Alarcon">John Alarcon</a>.  Greatly inspired by the ideas and work of <a href="http://www.snowjournal.com" title="Christopher S. Bradford">Christopher S. Bradford</a> and the additional supportive efforts of <a href="http://users.tpg.com.au/staer/" title="Martin Andersen">Martin Andersen</a>, <a href="http://www.landseer-stuttgart.de/" title="Frank Schummertz">Frank Schummertz</a>, <a href="http://pahlscomputers.com/" title="David Pahl">David Pahl</a> and <a href="http://www.itbegins.co.uk/" title="Simon Birtwistle">Simon Birtwistle</a>. Thanks guys!'),
-                              );
+                                );
         // Initialization.
         $explanation = '';
         // If no op or utility, assume main explanation is needed; return such.
@@ -1156,7 +1156,7 @@ 
                     $state = false;
                 }
                 break;
-             case 'tempdir':
+                case 'tempdir':
                 if (isset($this->INPUT['confirm']) && $this->INPUT['confirm'] == 1) {
                     $this->setRecoveryOutput(__('You have to reload the utility to see the current status of the temp directory.'));
                     $state = false;
@@ -1227,18 +1227,18 @@ 
             $selector .= '<optgroup label="'.$label.'">'."\n";
             // Loop through the themes of this type.
             foreach ($themes as $theme) {
-				if ($theme['state'] == 1) {
-					// Check if form was submitted.
-					if (!$this->INPUT['submit']) {
-						// Default; for selecting the currently set theme in the list.
-						$selected = ($theme['name'] == $this->siteTheme) ? 'selected="selected"' : null;
-					} else {
-						// When submitted, for selecting the selected theme in the list.
-						$selected = ($theme['name'] == $this->INPUT['theme']) ? 'selected="selected"' : null;
-					}
-					// Add option to selector.
-					$selector .= '<option label="'.$theme['name'].'" value="'.$theme['name'].'" '.$selected.'>'.$theme['name'].'</option>'."\n";
-				}
+                if ($theme['state'] == 1) {
+                    // Check if form was submitted.
+                    if (!$this->INPUT['submit']) {
+                        // Default; for selecting the currently set theme in the list.
+                        $selected = ($theme['name'] == $this->siteTheme) ? 'selected="selected"' : null;
+                    } else {
+                        // When submitted, for selecting the selected theme in the list.
+                        $selected = ($theme['name'] == $this->INPUT['theme']) ? 'selected="selected"' : null;
+                    }
+                    // Add option to selector.
+                    $selector .= '<option label="'.$theme['name'].'" value="'.$theme['name'].'" '.$selected.'>'.$theme['name'].'</option>'."\n";
+                }
             }
             // Ending the optgroup.
             $selector .= '</optgroup>'."\n";
@@ -1313,7 +1313,7 @@ 
         return $form;
     }
 
-     // Get additional inputs for temporary directory rebuild.
+        // Get additional inputs for temporary directory rebuild.
     public function getUtilityInputsTempdir()
     {
         if ($this->tempdirexists == false) {
@@ -1553,7 +1553,7 @@ 
             case 'outputfilter':
                 $success = $this->processRecoveryOutputFilter();
                 break;
-             case 'phpids':
+                case 'phpids':
                 $success = $this->processRecoveryPHPIDS();
                 break;
             default:
@@ -1715,7 +1715,7 @@ 
             return false;
         }
 
-         // check that username is not the anonymous one
+            // check that username is not the anonymous one
         $anonymous = ModUtil::getVar('Users', 'anonymous');
         if ($username == $anonymous || $username == strtolower($anonymous)) {
             $this->setError(__('You cannot change the password for the anonymous user. Please provide the username of a valid user'));
@@ -1784,7 +1784,7 @@ 
                 }
             }
         }
-       // create all subdirectories
+        // create all subdirectories
         else {
             foreach($this->tempdirsubs as $dir => $status) {
                 $result = mkdir($this->tempdir.'/'.$dir, null, true);
@@ -1835,7 +1835,7 @@ 
         return true;
     }
 
-     // Process PHPIDS disable
+        // Process PHPIDS disable
     public function processRecoveryPHPIDS()
     {
         if (!System::setVar('useids', false)) {

Spacing +227 added lines, -227 removed lines

@@ -66,7 +66,7 @@ 
     {
         // Set config file target to object early on, for usage in text defines.
         $dir = explode('/', $_SERVER['PHP_SELF']);
-        $this->siteConfigFile = $this->getServerProtocol().'://'.$this->getHost().'/'.$dir[1].'/config/config.php';
+        $this->siteConfigFile = $this->getServerProtocol() . '://' . $this->getHost() . '/' . $dir[1] . '/config/config.php';
     }
 
     // load all information needed
@@ -92,11 +92,11 @@ 
         while ($dir = readdir($handle)) {
             // Skip any files, up-dirs, and certain themes.
             if (substr($dir, 0, 1) == '.' ||
-                substr($dir, 0, 5)=='index' ||
-                substr($dir, 0, 3)=='rss' ||
-                substr($dir, 0, 4)=='Atom' ||
-                substr($dir, 0, 7)=='Printer' ||
-                substr($dir, 0, 9)=='AutoPrint') {
+                substr($dir, 0, 5) == 'index' ||
+                substr($dir, 0, 3) == 'rss' ||
+                substr($dir, 0, 4) == 'Atom' ||
+                substr($dir, 0, 7) == 'Printer' ||
+                substr($dir, 0, 9) == 'AutoPrint') {
                 continue;
             }
             // Catch the theme name.
@@ -124,7 +124,7 @@ 
         //
         // load all modules.
         //
-        $mods = DBUtil::selectObjectArray('modules',"WHERE ({$this->dbTables['modules_column']['id']} > 0)",'type');
+        $mods = DBUtil::selectObjectArray('modules', "WHERE ({$this->dbTables['modules_column']['id']} > 0)", 'type');
         // Loop through modules, sorting.
         foreach ($mods as $mod) {
             if ($mod['type'] == 3) {
@@ -151,7 +151,7 @@ 
         $this->tempdirsubsfailed = count($tempdirsubs);
         // Open the temp directory.
         $handle = opendir($this->tempdir);
-        if (!$handle){
+        if (!$handle) {
             $this->tempdirexists = false;
         } else {
             $this->tempdirexists = true;
@@ -225,7 +225,7 @@ 
         return true;
     }
     // Clean any input and set to object.
-    public function cleanUserInput($input=false)
+    public function cleanUserInput($input = false)
     {
         // Ensure input exists.
         if (!$input) {
@@ -241,7 +241,7 @@ 
         $cleaned = array();
         foreach ($input as $key=>$val) {
             // Special case: dba user/pass can contain more than text chars, do it inline.
-            if ($key=='zuname' || $key=='zpass1' || $key=='zpass2') {
+            if ($key == 'zuname' || $key == 'zpass1' || $key == 'zpass2') {
                 $cleaned[$key] = preg_replace('[!@#$%^_\w]', '', $val);
             } else {
                 // If $val is not an array, clean and add it to the $cleaned array.
@@ -249,7 +249,7 @@ 
                     $cleaned[$key] = $this->cleanUserInput($val);
                 } else {
                     // Else loop through $val, clean and add its data to $cleaned array.
-                    foreach($val as $key2=>$val2) {
+                    foreach ($val as $key2=>$val2) {
                         $cleaned[$key][$key2] = $this->cleanUserInput($val2);
                     }
                 }
@@ -314,49 +314,49 @@ 
     public function markupHeader()
     {
         // Handles everything through the opening <body> tag, inclusive.
-        $head  = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"'."\n";
-        $head .= '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'."\n";
-        $head .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US">'."\n\n";
-        $head .= '<head>'."\n\n";
-        $head .= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'."\n\n";
-        $head .= '<title>'.'Zikula Recovery Console'.'</title>'."\n\n";
+        $head  = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"' . "\n";
+        $head .= '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . "\n";
+        $head .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US">' . "\n\n";
+        $head .= '<head>' . "\n\n";
+        $head .= '<meta http-equiv="content-type" content="text/html; charset=utf-8" />' . "\n\n";
+        $head .= '<title>' . 'Zikula Recovery Console' . '</title>' . "\n\n";
         // Countdown timer script.  For GUI purposes only; security is not dependent upon Javascript.
         $head .= $this->markupJavascript();
         // All CSS comes via this method.
         $head .= $this->markupStyles();
-        $head .= '</head>'."\n\n";
-        $head .= '<body>'."\n\n";
-        $head .= '<div id="container">'."\n\n";
-        $head .= '    <div id="app_title">'.'Zikula Recovery Console'.'</div>'."\n\n";
+        $head .= '</head>' . "\n\n";
+        $head .= '<body>' . "\n\n";
+        $head .= '<div id="container">' . "\n\n";
+        $head .= '    <div id="app_title">' . 'Zikula Recovery Console' . '</div>' . "\n\n";
         // Return the string.
         return $head;
     }
     // Markup the Recovery Console page script.
     public function markupJavascript()
     {
-        $js  = '<script type="text/javascript">'."\n";
-        $js .= '<!--'."\n";
-        $js .= '    public function countDown(n) {'."\n";
+        $js  = '<script type="text/javascript">' . "\n";
+        $js .= '<!--' . "\n";
+        $js .= '    public function countDown(n) {' . "\n";
         $js .= '        if(document.getElementById("timer_container")) {';
-        $js .= '            mins = Math.floor(n/60);'."\n";
-        $js .= '            if(mins < 10) {'."\n";
-        $js .= '                mins = "0" + mins;'."\n";
-        $js .= '            }'."\n";
-        $js .= '            secs = n - mins*60;'."\n";
-        $js .= '            if(secs < 10) {'."\n";
-        $js .= '                secs = "0" + secs;'."\n";
-        $js .= '            }'."\n";
-        $js .= '            if(n > 0) {'."\n";
-        $js .= '                document.getElementById("timer_container").innerHTML = \''.__('LOCKDOWN TIMER').'<div id="timer_digits">\'+mins+\':\' + secs + \'<\/div><div id="timer_reason">'.__('The Zikula Recovery Console will be automatically disabled when the timer expires.  If it expires before you finish your work, simply re-upload the file and refresh your browser.  The timer will be reset.').'<\/div>\';'."\n";
-        $js .= '                setTimeout(function() { countDown(n - 1) }, 1000)'."\n";
-        $js .= '            } else if (n == 0) {'."\n";
-        $js .= '                document.getElementById("timer_container").innerHTML =  \''.__('LOCKDOWN ENGAGED').'<div id="timer_reason" class="red">'.__('The Zikula Recovery Console is now disabled from further use as a security precaution.  You must upload a new copy of this file to reset the lockdown timer.').'<\/div>\';'."\n";
-        $js .= '            }'."\n";
-        $js .= '        }'."\n";
-        $js .= '    }'."\n";
-        $js .= '    onload = function() { countDown('.$this->appTimeElapser().') }'."\n";
-        $js .= '-->'."\n";
-        $js .= '</script>'."\n\n";
+        $js .= '            mins = Math.floor(n/60);' . "\n";
+        $js .= '            if(mins < 10) {' . "\n";
+        $js .= '                mins = "0" + mins;' . "\n";
+        $js .= '            }' . "\n";
+        $js .= '            secs = n - mins*60;' . "\n";
+        $js .= '            if(secs < 10) {' . "\n";
+        $js .= '                secs = "0" + secs;' . "\n";
+        $js .= '            }' . "\n";
+        $js .= '            if(n > 0) {' . "\n";
+        $js .= '                document.getElementById("timer_container").innerHTML = \'' . __('LOCKDOWN TIMER') . '<div id="timer_digits">\'+mins+\':\' + secs + \'<\/div><div id="timer_reason">' . __('The Zikula Recovery Console will be automatically disabled when the timer expires.  If it expires before you finish your work, simply re-upload the file and refresh your browser.  The timer will be reset.') . '<\/div>\';' . "\n";
+        $js .= '                setTimeout(function() { countDown(n - 1) }, 1000)' . "\n";
+        $js .= '            } else if (n == 0) {' . "\n";
+        $js .= '                document.getElementById("timer_container").innerHTML =  \'' . __('LOCKDOWN ENGAGED') . '<div id="timer_reason" class="red">' . __('The Zikula Recovery Console is now disabled from further use as a security precaution.  You must upload a new copy of this file to reset the lockdown timer.') . '<\/div>\';' . "\n";
+        $js .= '            }' . "\n";
+        $js .= '        }' . "\n";
+        $js .= '    }' . "\n";
+        $js .= '    onload = function() { countDown(' . $this->appTimeElapser() . ') }' . "\n";
+        $js .= '-->' . "\n";
+        $js .= '</script>' . "\n\n";
         // Return created string.
         return $js;
     }
@@ -644,33 +644,33 @@ 
     public function markupMenu()
     {
         // Open the left column container.
-        $menu  = '    <div id="left_column">'."\n\n";
+        $menu  = '    <div id="left_column">' . "\n\n";
         // Open the navigation block container.
         $menu .= '        <div id="navblock">';
         // Main link.
-        $menu .= '<strong>'.$this->markupMenuLink('','',            __('Main'), __('Configuration Overview')).'</strong>';
+        $menu .= '<strong>' . $this->markupMenuLink('', '', __('Main'), __('Configuration Overview')) . '</strong>';
         // Additional links.
-        $menu .= $this->markupMenuLink('recover',   'theme',        __('Theme Recovery'));
-        $menu .= $this->markupMenuLink('recover',   'permission',   __('Permission Recovery'));
-        $menu .= $this->markupMenuLink('recover',   'block',        __('Block Recovery'));
-        $menu .= $this->markupMenuLink('recover',   'site',         __('Disabled Site Recovery'));
-        $menu .= $this->markupMenuLink('recover',   'password',     __('Password Reset'));
-        $menu .= $this->markupMenuLink('recover',   'tempdir',      __('Rebuild Temp Directory'));
-        $menu .= $this->markupMenuLink('recover',   'outputfilter', __('Reset Output Filter'));
-        $menu .= $this->markupMenuLink('recover',   'phpids',       __('Disable PHPIDS'));
-        $menu .= $this->markupMenuLink('phpinfo',   '',             __('PHP Information'));
-        $menu .= $this->markupMenuLink('about',     '',             __('About This Application'));
+        $menu .= $this->markupMenuLink('recover', 'theme', __('Theme Recovery'));
+        $menu .= $this->markupMenuLink('recover', 'permission', __('Permission Recovery'));
+        $menu .= $this->markupMenuLink('recover', 'block', __('Block Recovery'));
+        $menu .= $this->markupMenuLink('recover', 'site', __('Disabled Site Recovery'));
+        $menu .= $this->markupMenuLink('recover', 'password', __('Password Reset'));
+        $menu .= $this->markupMenuLink('recover', 'tempdir', __('Rebuild Temp Directory'));
+        $menu .= $this->markupMenuLink('recover', 'outputfilter', __('Reset Output Filter'));
+        $menu .= $this->markupMenuLink('recover', 'phpids', __('Disable PHPIDS'));
+        $menu .= $this->markupMenuLink('phpinfo', '', __('PHP Information'));
+        $menu .= $this->markupMenuLink('about', '', __('About This Application'));
         // Closing the navigation block container.
-        $menu .= '</div>'."\n\n";
+        $menu .= '</div>' . "\n\n";
         // Add the lockdown timer.
-        $menu .= '        <div id="timer_container"></div>'."\n\n";
+        $menu .= '        <div id="timer_container"></div>' . "\n\n";
         // Close the left column container.
-        $menu .= '    </div>'."\n\n";
+        $menu .= '    </div>' . "\n\n";
         // Return the created markup.
         return $menu;
     }
     // Markup the Recovery Console main menu links.
-    public function markupMenuLink($op=false, $utility=false, $text='', $title=false)
+    public function markupMenuLink($op = false, $utility = false, $text = '', $title = false)
     {
         // Check if this link is a database-requiring utility.
         $dba_reqd = (in_array($utility, $this->getAllDatabaseUtilities())) ? true : false;
@@ -686,25 +686,25 @@ 
         // -----
         // Return a dimmed link when incompatibility exists.
         if (!$this->appCompatible()) {
-            return '<a '.$style.'href="'.$action.'"><del title="'. $title.'">'.$text.$asterisk.'</del></a>';
+            return '<a ' . $style . 'href="' . $action . '"><del title="' . $title . '">' . $text . $asterisk . '</del></a>';
         }
         // LINK RETURN POINT: Main un-argumented link
         // -----
         // If no operation present (ie, Main) return link here.
         if (!$op) {
-            return '<a '.$style.'href="'.$action.'" title="'. $title.'">'.$text.'</a>';
+            return '<a ' . $style . 'href="' . $action . '" title="' . $title . '">' . $text . '</a>';
         }
         // Attach operation to action string.
-        $action .= '?op='.$op;
+        $action .= '?op=' . $op;
         // Re-assign the selected style based on $op.
         $style = ($op === $this->operation) ? 'class="selected"' : null;
         // LINK RETURN POINT: Link has $op arg only (ie, about, phpinfo).
         // -----
         if (!$utility) {
-            return '<a '.$style.'href="'.$action.'" title="'. $title.'">'.$text.'</a>';
+            return '<a ' . $style . 'href="' . $action . '" title="' . $title . '">' . $text . '</a>';
         }
         // Attach utility to action string.
-        $action .= '&amp;utility='.$utility;
+        $action .= '&amp;utility=' . $utility;
         // Reassign the selected style based on $utility.
         $style = ($utility == $this->utility) ? 'class="selected" ' : null;
         // LINK RETURN POINT: Link with $op and $utility, requires DB.
@@ -712,13 +712,13 @@ 
         if ($dba_reqd) {
             // Return a "dimmed" link if the database connection failed.
             if (!$this->dbEnabled) {
-                return '<a '.$style.'href="'.$action.'"><del title="'. $title.'">'.$text.$asterisk.'</del></a>';
+                return '<a ' . $style . 'href="' . $action . '"><del title="' . $title . '">' . $text . $asterisk . '</del></a>';
             }
             // Return a regular link with $op and $utility args if the database connection exists.
-            return '<a '.$style.'href="'.$action.'" title="'. $title.'">'.$text.$asterisk.'</a>';
+            return '<a ' . $style . 'href="' . $action . '" title="' . $title . '">' . $text . $asterisk . '</a>';
         }
         // LINK RETURN POINT: Link with $op and $utility, requires no database access. (ie, dba credential encoding utility.)
-        return '<a '.$style.'href="'.$action.'" title="'. $title.'">'.$text.'</a>';
+        return '<a ' . $style . 'href="' . $action . '" title="' . $title . '">' . $text . '</a>';
     }
     // Markup the Recovery Console content area.
     public function markupBodyContent()
@@ -730,7 +730,7 @@ 
             // Check if app is compatible with site.
             if (!$this->appCompatible()) {
                 // If not, append a message, close container and return; user goes no further.
-                $content .= __('<strong>THIS APPLICATION IS INCOMPATIBLE WITH YOUR SITE<br />This application works only with Zikula 1.x+.<br />When stil using PostNuke .764 consider the <a href="http://community.zikula.org/Downloads-req-viewdownload-cid-7.htm" title="PostNuke Swiss Army Knife">PostNuke Swiss Army Knife</a> (PSAK) utility.').'</div>'."\n\n";
+                $content .= __('<strong>THIS APPLICATION IS INCOMPATIBLE WITH YOUR SITE<br />This application works only with Zikula 1.x+.<br />When stil using PostNuke .764 consider the <a href="http://community.zikula.org/Downloads-req-viewdownload-cid-7.htm" title="PostNuke Swiss Army Knife">PostNuke Swiss Army Knife</a> (PSAK) utility.') . '</div>' . "\n\n";
                 return $content;
             }
         }
@@ -742,39 +742,39 @@ 
             $this->op      = false;
             $this->utility = false;
             // Append a message, close container and return; user goes no further.
-            $content .= __('Invalid Operation').'</div>'."\n\n";
+            $content .= __('Invalid Operation') . '</div>' . "\n\n";
             return $content;
         }
 
         // Get and contain the title of the utility.
-        $content .= '        <div id="page_title" title="'.$this->getTitle().'">'.$this->getTitle().'</div>'."\n\n";
+        $content .= '        <div id="page_title" title="' . $this->getTitle() . '">' . $this->getTitle() . '</div>' . "\n\n";
         // Check if this particular utility requires db access.
         if (in_array($this->utility, $this->getAllDatabaseUtilities())) {
             // If so, check if database is ready.
             if (!$this->dbEnabled) {
                 // If not, set descriptive message, close container & return; go no further.
-                $content .= '        <div id="explain_disabled">Database required.</div>'."\n\n";
-                $content .= '    </div>'."\n\n";
+                $content .= '        <div id="explain_disabled">Database required.</div>' . "\n\n";
+                $content .= '    </div>' . "\n\n";
                 return $content;
             }
         }
         // A switch calls the methods that gather the page/utility content.
-        switch($this->operation) {
+        switch ($this->operation) {
             case 'about': // About page only requires explanation.
-                $content .= '        <div id="explain">'.$this->getExplanation().'</div>'."\n\n";
+                $content .= '        <div id="explain">' . $this->getExplanation() . '</div>' . "\n\n";
                 break;
             case 'phpinfo': // PHPinfo is processed; get utility, but not explanation.
-                $content .= '        <div id="utility">'."\n\n".$this->getUtility().'        </div>'."\n\n";
+                $content .= '        <div id="utility">' . "\n\n" . $this->getUtility() . '        </div>' . "\n\n";
                 break;
             case 'recover':
                 // Recoveries require explanation, current setting and utility.
                 if (!in_array($this->utility, $this->getAllUtilities())) {
                     // Set message and escape early since utility is not valid.
-                    $content .= '        <div id="explain">'.__('Invalid Utility').'</div>'."\n\n";
+                    $content .= '        <div id="explain">' . __('Invalid Utility') . '</div>' . "\n\n";
                     break;
                 }
                 // Add utility explanation.
-                $content .= '        <div id="explain">'.$this->getExplanation().'</div>'."\n\n";
+                $content .= '        <div id="explain">' . $this->getExplanation() . '</div>' . "\n\n";
                 // Check if form was submitted.
                 if ($this->INPUT['submit']) {
                     // Process recovery.
@@ -783,21 +783,21 @@ 
                     $content .= $this->markupNotices();
                 }
                 // Add current setting here (as it may have just changed).
-                $content .= '        <div id="current">'.$this->getCurrentSetting().'</div>'."\n\n";
+                $content .= '        <div id="current">' . $this->getCurrentSetting() . '</div>' . "\n\n";
                 // Add the utility content to the output.
-                $content .= '        <div id="utility">'."\n\n".$this->getUtility().'        </div>'."\n\n";
+                $content .= '        <div id="utility">' . "\n\n" . $this->getUtility() . '        </div>' . "\n\n";
                 break;
             default:
                 // Default cases will show the main overview explanation.
-                $content .= '        <div id="explain">'.$this->getExplanation().'</div>'."\n\n";
+                $content .= '        <div id="explain">' . $this->getExplanation() . '</div>' . "\n\n";
                 // Default cases will show the prepared overview.
-                $content .= '        <div id="utility">'."\n\n".$this->getUtility().'        </div>'."\n\n";
+                $content .= '        <div id="utility">' . "\n\n" . $this->getUtility() . '        </div>' . "\n\n";
                 break;
         }
         // On all pages, append Zikula site-search feature.
-        $content .= '    <div id="search">'.$this->markupSearchBox().'</div>';
+        $content .= '    <div id="search">' . $this->markupSearchBox() . '</div>';
         // Closing the body-column container.
-        $content .= '    </div>'."\n\n";
+        $content .= '    </div>' . "\n\n";
         // Return the content string.
         return $content;
     }
@@ -805,7 +805,7 @@ 
     public function markupSearchBox()
     {
         // Markup a form to search the PN site.
-        $search  = '<div><strong class="blue">'.__('Still need help?').'</strong> '.__('Search the <em>entire</em> Zikula site here!').'</div>'."\n\n";
+        $search  = '<div><strong class="blue">' . __('Still need help?') . '</strong> ' . __('Search the <em>entire</em> Zikula site here!') . '</div>' . "\n\n";
         $search .= '<form method="post" action="http://community.zikula.org/index.php" style="display:inline;">
                     <div>
                         <img src="images/icons/extrasmall/search.png" style="float:left;margin:2px 5px 0 0;" alt="search" />
@@ -830,7 +830,7 @@ 
                         <input type="hidden" name="total" value="" />
                         <input type="hidden" name="numlimit" value="250" />
                         <input type="hidden" name="bool" value="AND" />
-                        <input type="submit" id="search_b" value="'.__('SEARCH').'" title="Search" />
+                        <input type="submit" id="search_b" value="'.__('SEARCH') . '" title="Search" />
                     </div>
                 </form>';
         // Return search form markup.
@@ -841,15 +841,15 @@ 
     {
         // Footer container and anchors.
         $footer  = '    <div id="footer">';
-        $footer .= '<a href="http://code.zikula.org/core" title="'.'Zikula Recovery Console'.' v.'.self::VERSION.'">'.'Zikula Recovery Console'.' v.'.self::VERSION.'</a>';
+        $footer .= '<a href="http://code.zikula.org/core" title="' . 'Zikula Recovery Console' . ' v.' . self::VERSION . '">' . 'Zikula Recovery Console' . ' v.' . self::VERSION . '</a>';
         $footer .= '<br /><br />';
         $footer .= '<img src="images/powered/small/cms_zikula.png" alt="Zikula-logo" />&nbsp;<img src="images/powered/small/php_powered.png" alt="PHP-Logo"  />';
         // Closing the footer container.
-        $footer .= '</div>'."\n\n";
+        $footer .= '</div>' . "\n\n";
         // Closing the main container.
-        $footer .= '</div>'."\n\n";
+        $footer .= '</div>' . "\n\n";
         // Finish off the page markup.
-        $footer .= '</body>'."\n\n".'</html>';
+        $footer .= '</body>' . "\n\n" . '</html>';
         // Returning the markup.
         return $footer;
     }
@@ -879,19 +879,19 @@ 
         // Check if errors exist.
         if (!empty($errors)) {
             // Container.
-            $markup .= '        <div id="error">'."\n\n";
+            $markup .= '        <div id="error">' . "\n\n";
             // Short text title.
-            $markup .= '<strong>'.__('ERROR').'</strong><br />'."\n";
+            $markup .= '<strong>' . __('ERROR') . '</strong><br />' . "\n";
             // Start an unordered list.
-            $markup .= '<ul>'."\n";
+            $markup .= '<ul>' . "\n";
             // Converting errors into list items.
             foreach ($errors as $msg) {
-                $markup .= '<li>' . $msg . '</li>'."\n";
+                $markup .= '<li>' . $msg . '</li>' . "\n";
             }
             // End the unordered list.
-            $markup .= '</ul>'."\n";
+            $markup .= '</ul>' . "\n";
             // Closing container.
-            $markup .= '        </div>'."\n\n";
+            $markup .= '        </div>' . "\n\n";
             // Return markup string.
             return $markup;
         }
@@ -900,32 +900,32 @@ 
         // --------------------
         if (!empty($status)) {
             // Container.
-            $markup .= '        <div id="status">'."\n\n";
+            $markup .= '        <div id="status">' . "\n\n";
             // Short text title.
-            $markup .= '<strong>'.__('STATUS').'</strong><br />'."\n";
+            $markup .= '<strong>' . __('STATUS') . '</strong><br />' . "\n";
             // Start an unordered list.
-            $markup .= '<ul>'."\n";
+            $markup .= '<ul>' . "\n";
             // Converting errors into list items.
             foreach ($status as $msg) {
-                $markup .= '<li>' . $msg . '</li>'."\n";
+                $markup .= '<li>' . $msg . '</li>' . "\n";
             }
             // End the unordered list.
-            $markup .= '</ul>'."\n";
+            $markup .= '</ul>' . "\n";
             // --------------------
             // DO ANY RECOVERY OUTPUT
             // --------------------
             if (!empty($output)) {
                 // For consistence.
-                $markup .= '<pre>'."\n";
+                $markup .= '<pre>' . "\n";
                 // Converting output to lines.
                 foreach ($output as $line) {
                     $markup .= $line . "\n";
                 }
                 // End preformatting.
-                $markup .= '</pre>'."\n";
+                $markup .= '</pre>' . "\n";
             }
             // Closing container.
-            $markup .= '        </div>'."\n\n";
+            $markup .= '        </div>' . "\n\n";
         }
         // Return the markup.
         return $markup;
@@ -953,7 +953,7 @@ 
             $host = $_SERVER['SERVER_NAME'];
             // Append port to host if port is other than 80;
             if ($_SERVER['SERVER_PORT'] != '80') {
-                $host .= ':'.$_SERVER['SERVER_PORT'];
+                $host .= ':' . $_SERVER['SERVER_PORT'];
             }
         }
         // Return the host.
@@ -1017,7 +1017,7 @@ 
                               'outputfilter'  => __('<strong>INSTRUCTIONS:</strong> Use this utility to reset the output filter to \'internal\'. Useful if there is something wrong with the output filters in use (eg. HTMLPurifier).'),
                               'phpids'        => __('<strong>INSTRUCTIONS:</strong> Use this utility to disable PHPIDS. Useful if your settings in PHPIDS crashed the entire system.'),
                               'about'         => __('About')
-                                                .__('<strong>VERSION</strong><br />This is <strong>Version '.self::VERSION.'</strong> of the <strong>Zikula Recovery Console</strong><br /><br />')
+                                                .__('<strong>VERSION</strong><br />This is <strong>Version ' . self::VERSION . '</strong> of the <strong>Zikula Recovery Console</strong><br /><br />')
                                                 .__('<strong>LICENSE</strong><br /><a href="http://www.gnu.org/copyleft/gpl.html" title="General Public License">General Public License</a><br /><br />')
                                                 .__('<strong>CREDITS</strong><br />Maintained and enhanced by the Zikula CoreDev team. Originally developed by <a href="http://www.alarconcepts.com/" title="John Alarcon">John Alarcon</a>.  Greatly inspired by the ideas and work of <a href="http://www.snowjournal.com" title="Christopher S. Bradford">Christopher S. Bradford</a> and the additional supportive efforts of <a href="http://users.tpg.com.au/staer/" title="Martin Andersen">Martin Andersen</a>, <a href="http://www.landseer-stuttgart.de/" title="Frank Schummertz">Frank Schummertz</a>, <a href="http://pahlscomputers.com/" title="David Pahl">David Pahl</a> and <a href="http://www.itbegins.co.uk/" title="Simon Birtwistle">Simon Birtwistle</a>. Thanks guys!'),
                               );
@@ -1044,9 +1044,9 @@ 
     public function getCurrentSetting()
     {
         // A short descriptive title.
-        $setting = '<strong>'.__('Current Setting:').'</strong> ';
+        $setting = '<strong>' . __('Current Setting:') . '</strong> ';
         // Switch to get proper text.
-        switch($this->utility) {
+        switch ($this->utility) {
             case 'theme':
                 $setting .= $this->siteTheme;
                 break;
@@ -1114,24 +1114,24 @@ 
             }
             // Loop through recovery output.
             foreach ($output as $line) {
-                $form .= ' '.$line;
+                $form .= ' ' . $line;
             }
             return $form;
         }
         // ...else a site-fixing form should be built.  Every form comes with confirm and submit;
         // any additional inputs are formatted for display in getUtilityInputs* for auto-inclusion.
         // Start the form.
-        $form = '            <form method="post" action="'.$this->getBaseScript().'?op='.$this->operation.'&amp;utility='.$this->utility.'" enctype="application/x-www-form-urlencoded">'."\n\n";
+        $form = '            <form method="post" action="' . $this->getBaseScript() . '?op=' . $this->operation . '&amp;utility=' . $this->utility . '" enctype="application/x-www-form-urlencoded">' . "\n\n";
         // If any additional inputs/markup are available for this utility, get them.
-        if (method_exists($this, $method='getUtilityInputs'.$this->utility)) {
+        if (method_exists($this, $method = 'getUtilityInputs' . $this->utility)) {
             $form .= $this->$method();
         }
         // Confirmation and submit inputs.
-        $form .= '                <div class="row"><div class="row_left"><label for="confirm">'.__('Click To Confirm').'</label></div><div class="row_right"><input id="confirm" type="checkbox" name="confirm" value="1" /></div></div>'."\n\n";
-        $form .= '                <div class="row"><div class="row_left"><label for="submit">&nbsp;</label></div><div class="row_right"><input class="submit" type="submit" name="submit" id="submit" value="'.__('Run Utility').'" /></div></div>'."\n\n";
-        $form .= '                <div style="clear:both;"></div>'."\n\n";
+        $form .= '                <div class="row"><div class="row_left"><label for="confirm">' . __('Click To Confirm') . '</label></div><div class="row_right"><input id="confirm" type="checkbox" name="confirm" value="1" /></div></div>' . "\n\n";
+        $form .= '                <div class="row"><div class="row_left"><label for="submit">&nbsp;</label></div><div class="row_right"><input class="submit" type="submit" name="submit" id="submit" value="' . __('Run Utility') . '" /></div></div>' . "\n\n";
+        $form .= '                <div style="clear:both;"></div>' . "\n\n";
         // Close the form and container.
-        $form .= '            </form>'."\n\n";
+        $form .= '            </form>' . "\n\n";
         // Return the form.
         return $form;
     }
@@ -1141,7 +1141,7 @@ 
         // Default the utility state to 'enabled' = true.
         $state = true;
         // Utilities for non-broken items can be disabled here.
-        switch($this->utility) {
+        switch ($this->utility) {
             case 'block':
                 // If site has no blocks, disable this utility.
                 if (count($this->blocks) == 0) {
@@ -1162,11 +1162,11 @@ 
                     $state = false;
                 } elseif ($this->tempdirexists && $this->tempdirsubsfailed == 0) {
                     $output  = "<br /><br />\n";
-                    $output .= __('Your temporary directory seems to exist. The status of the subdirectories is as follows:')."\n";
+                    $output .= __('Your temporary directory seems to exist. The status of the subdirectories is as follows:') . "\n";
                     $output .= "<br /><br />\n";
 
-                    foreach($this->tempdirsubs as $dir => $status) {
-                        $output .= '<img src="images/icons/extrasmall/button_ok.png" alt="'.__('directory status').'" /> '.$dir."\n";
+                    foreach ($this->tempdirsubs as $dir => $status) {
+                        $output .= '<img src="images/icons/extrasmall/button_ok.png" alt="' . __('directory status') . '" /> ' . $dir . "\n";
                         $output .= "<br />\n";
                     }
 
@@ -1201,7 +1201,7 @@ 
     // enable site
     public function getUtilityInputsSite()
     {
-        return '<p>'.__('Set the following checkbox to re-enable your site.').'</p>';
+        return '<p>' . __('Set the following checkbox to re-enable your site.') . '</p>';
     }
 
     // Get inputs for theme recovery.
@@ -1211,7 +1211,7 @@ 
         ModUtil::apiFunc('Theme', 'admin', 'regenerate');
 
         // First, create a dynamic selector.
-        $selector = '<select name="theme" id="theme" size="1">'."\n";
+        $selector = '<select name="theme" id="theme" size="1">' . "\n";
         // Loop through all themes.
         foreach ($this->themes as $type => $themes) {
             // Skip any numerically-keyed elements.
@@ -1219,12 +1219,12 @@ 
                 continue;
             }
             // Assign optgroup text.
-            $label =__('Core Themes');
+            $label = __('Core Themes');
             // Create an optgroup for the theme type.
             if (count($themes) == 0) {
                 continue;
             }
-            $selector .= '<optgroup label="'.$label.'">'."\n";
+            $selector .= '<optgroup label="' . $label . '">' . "\n";
             // Loop through the themes of this type.
             foreach ($themes as $theme) {
 				if ($theme['state'] == 1) {
@@ -1237,17 +1237,17 @@ 
 						$selected = ($theme['name'] == $this->INPUT['theme']) ? 'selected="selected"' : null;
 					}
 					// Add option to selector.
-					$selector .= '<option label="'.$theme['name'].'" value="'.$theme['name'].'" '.$selected.'>'.$theme['name'].'</option>'."\n";
+					$selector .= '<option label="' . $theme['name'] . '" value="' . $theme['name'] . '" ' . $selected . '>' . $theme['name'] . '</option>' . "\n";
 				}
             }
             // Ending the optgroup.
-            $selector .= '</optgroup>'."\n";
+            $selector .= '</optgroup>' . "\n";
         }
         // Ending the selector.
-        $selector .= '</select>'."\n";
+        $selector .= '</select>' . "\n";
         // Create the "utility" portion of the form and return it.
-        $form  = '                <div class="row"><div class="row_left"><label for="themes">'.__('Available Themes').'</label></div><div class="row_right">'.$selector.'</div></div>'."\n";
-        $form .= '                <div class="row"><div class="row_left"><label for="resetusers">'.__('Reset User Themes').'</label></div><div class="row_right"><input id="resetusers" type="checkbox" name="resetusers" value="1"'.(($this->INPUT['resetusers'] && $this->getErrors()) ? ' checked="checked"' : null).'  /></div></div>'."\n";
+        $form  = '                <div class="row"><div class="row_left"><label for="themes">' . __('Available Themes') . '</label></div><div class="row_right">' . $selector . '</div></div>' . "\n";
+        $form .= '                <div class="row"><div class="row_left"><label for="resetusers">' . __('Reset User Themes') . '</label></div><div class="row_right"><input id="resetusers" type="checkbox" name="resetusers" value="1"' . (($this->INPUT['resetusers'] && $this->getErrors()) ? ' checked="checked"' : null) . '  /></div></div>' . "\n";
         return $form;
     }
 
@@ -1256,13 +1256,13 @@ 
     {
         // Cheating a little; there are no actual inputs here.
         $form  = '<pre style="font-size:7.25pt;">';
-        $form .= '<strong style="font-size:9pt;">'.__('Default Permissions').'</strong>'."\n";
+        $form .= '<strong style="font-size:9pt;">' . __('Default Permissions') . '</strong>' . "\n";
         $form .= '<div class="bar"><strong>     GROUP      |      COMPONENT      |    INSTANCE   |  PERMISSION LEVEL</strong></div>';
-        $form .= ' Administrators |        .*           |      .*       |     Admin'."\n";
-        $form .= '   All Groups   | ExtendedMenublock:: |      1:2:     |     None'."\n";
-        $form .= '     Users      |        .*           |      .*       |     Comment'."\n";
-        $form .= '  Unregistered  | ExtendedMenublock:: |    1:(1|3):   |     None'."\n";
-        $form .= '  Unregistered  |        .*           |      .*       |     Read'."\n";
+        $form .= ' Administrators |        .*           |      .*       |     Admin' . "\n";
+        $form .= '   All Groups   | ExtendedMenublock:: |      1:2:     |     None' . "\n";
+        $form .= '     Users      |        .*           |      .*       |     Comment' . "\n";
+        $form .= '  Unregistered  | ExtendedMenublock:: |    1:(1|3):   |     None' . "\n";
+        $form .= '  Unregistered  |        .*           |      .*       |     Read' . "\n";
         $form .= '</pre>';
         return $form;
     }
@@ -1271,44 +1271,44 @@ 
     public function getUtilityInputsBlock()
     {
         $form  = '<table width="100%" border="1" style="border-collapse:collapse;" cellpadding="3" cellspacing="0">';
-        $form .= '<tr style="background:#f2f2f2;">'."\n\n";
-        $form .= '<th>'.__('BID').'</th>'."\n\n";
-        $form .= '<th>'.__('Key').'</th>'."\n\n";
-        $form .= '<th width="100%">'.__('Title').'</th>'."\n\n";
-        $form .= '<th>'.__('State').'</th>'."\n\n";
-        $form .= '<th>'.__('MID').'</th>'."\n\n";
-        $form .= '<th>'.__('Make No Changes').'</th>'."\n\n";
-        $form .= '<th>'.__('Disable Block').'</th>'."\n\n";
-        $form .= '<th>'.__('Delete Block').'</th>'."\n\n";
-        $form .= '</tr>'."\n\n";
-        $row=0;
+        $form .= '<tr style="background:#f2f2f2;">' . "\n\n";
+        $form .= '<th>' . __('BID') . '</th>' . "\n\n";
+        $form .= '<th>' . __('Key') . '</th>' . "\n\n";
+        $form .= '<th width="100%">' . __('Title') . '</th>' . "\n\n";
+        $form .= '<th>' . __('State') . '</th>' . "\n\n";
+        $form .= '<th>' . __('MID') . '</th>' . "\n\n";
+        $form .= '<th>' . __('Make No Changes') . '</th>' . "\n\n";
+        $form .= '<th>' . __('Disable Block') . '</th>' . "\n\n";
+        $form .= '<th>' . __('Delete Block') . '</th>' . "\n\n";
+        $form .= '</tr>' . "\n\n";
+        $row = 0;
         foreach ($this->blocks as $block) {
             $class = ($row++ & 1) ? ' style="background:#fafafa;"' : null;
-            $form .= '<tr'.$class.'>'."\n\n";
-            $form .= '<td class="center">'.$block['bid'].'</td>'."\n\n";
-            $form .= '<td>'.$block['bkey'].'</td>'."\n\n";
-            $form .= '<td>'.$block['title'].'</td>'."\n\n";
-            $form .= '<td class="center">'.(($block['active']) ? '<img src="images/icons/extrasmall/greenled.png" alt="'.$block['title'].' :: '.__('active').'" title="'.$block['title'].' :: '.__('active').'" />' : '<img src="images/icons/extrasmall/yellowled.png" alt="'.$block['title'].' :: '.__('inactive').'" title="'.$block['title'].' :: '.__('inactive').'" />').'</td>'."\n\n";
-            $form .= '<td class="center">'.$block['mid'].'</td>'."\n\n";
-            $form .= '<td class="center"><input type="radio" name="blocks['.$block['bid'].']" value="0"'.((empty($this->INPUT['blocks'][$block['bid']])) ? ' checked="checked"' : null).' /></td>'."\n\n";
+            $form .= '<tr' . $class . '>' . "\n\n";
+            $form .= '<td class="center">' . $block['bid'] . '</td>' . "\n\n";
+            $form .= '<td>' . $block['bkey'] . '</td>' . "\n\n";
+            $form .= '<td>' . $block['title'] . '</td>' . "\n\n";
+            $form .= '<td class="center">' . (($block['active']) ? '<img src="images/icons/extrasmall/greenled.png" alt="' . $block['title'] . ' :: ' . __('active') . '" title="' . $block['title'] . ' :: ' . __('active') . '" />' : '<img src="images/icons/extrasmall/yellowled.png" alt="' . $block['title'] . ' :: ' . __('inactive') . '" title="' . $block['title'] . ' :: ' . __('inactive') . '" />') . '</td>' . "\n\n";
+            $form .= '<td class="center">' . $block['mid'] . '</td>' . "\n\n";
+            $form .= '<td class="center"><input type="radio" name="blocks[' . $block['bid'] . ']" value="0"' . ((empty($this->INPUT['blocks'][$block['bid']])) ? ' checked="checked"' : null) . ' /></td>' . "\n\n";
             if ($block['active'] != 0) {
-                $form .= '<td class="center"><input type="radio" name="blocks['.$block['bid'].']" value="1"'.(($this->INPUT['blocks'][$block['bid']]==1) ? ' checked="checked"' : null).' /></td>'."\n\n";
+                $form .= '<td class="center"><input type="radio" name="blocks[' . $block['bid'] . ']" value="1"' . (($this->INPUT['blocks'][$block['bid']] == 1) ? ' checked="checked"' : null) . ' /></td>' . "\n\n";
             } else {
-                $form .= '<td class="center">'.__('N/A').'</td>';
+                $form .= '<td class="center">' . __('N/A') . '</td>';
             }
-            $form .= '<td class="center"><input type="radio" name="blocks['.$block['bid'].']" value="2"'.(($this->INPUT['blocks'][$block['bid']]==2) ? ' checked="checked"' : null).' /></td>'."\n\n";
-            $form .= '</tr>'."\n\n";
+            $form .= '<td class="center"><input type="radio" name="blocks[' . $block['bid'] . ']" value="2"' . (($this->INPUT['blocks'][$block['bid']] == 2) ? ' checked="checked"' : null) . ' /></td>' . "\n\n";
+            $form .= '</tr>' . "\n\n";
         }
-        $form .= '</table><br />'."\n\n";
+        $form .= '</table><br />' . "\n\n";
         return $form;
     }
 
     // Get additional inputs for password reset.
     public function getUtilityInputsPassword()
     {
-        $form   = '                <div class="row"><div class="row_left"><label for="zuname">'.__('Username').'</label></div><div class="row_right"><input type="text" id="zuname" name="zuname" value="admin" /></div></div>'."\n";
-        $form  .= '                <div class="row"><div class="row_left"><label for="zpass1">'.__('New password').'</label></div><div class="row_right"><input type="password" id="zpass1" name="zpass1" /></div></div>'."\n";
-        $form  .= '                <div class="row"><div class="row_left"><label for="zpass2">'.__('New password again (for verification)').'</label></div><div class="row_right"><input type="password" id="zpass2" name="zpass2" /></div></div>'."\n";
+        $form   = '                <div class="row"><div class="row_left"><label for="zuname">' . __('Username') . '</label></div><div class="row_right"><input type="text" id="zuname" name="zuname" value="admin" /></div></div>' . "\n";
+        $form  .= '                <div class="row"><div class="row_left"><label for="zpass1">' . __('New password') . '</label></div><div class="row_right"><input type="password" id="zpass1" name="zpass1" /></div></div>' . "\n";
+        $form  .= '                <div class="row"><div class="row_left"><label for="zpass2">' . __('New password again (for verification)') . '</label></div><div class="row_right"><input type="password" id="zpass2" name="zpass2" /></div></div>' . "\n";
 
         return $form;
     }
@@ -1317,18 +1317,18 @@ 
     public function getUtilityInputsTempdir()
     {
         if ($this->tempdirexists == false) {
-            $form  = __('Your temporary directory does not seem to exist. It will be built from scratch')."\n";
+            $form  = __('Your temporary directory does not seem to exist. It will be built from scratch') . "\n";
         } else {
-            $form  = __('Your temporary directory seems to exist. The status of the subdirectories is as follows:')."\n";
+            $form  = __('Your temporary directory seems to exist. The status of the subdirectories is as follows:') . "\n";
             $form .= "<br /><br />\n";
 
-            foreach($this->tempdirsubs as $dir => $status) {
+            foreach ($this->tempdirsubs as $dir => $status) {
                 if ($status == 1) {
                     $icon = 'button_ok.png';
                 } else {
                     $icon = 'button_cancel.png';
                 }
-                $form .= '<img src="images/icons/extrasmall/'.$icon.'" alt="'.__('directory status').'" /> '.$dir."\n";
+                $form .= '<img src="images/icons/extrasmall/' . $icon . '" alt="' . __('directory status') . '" /> ' . $dir . "\n";
                 $form .= "<br />\n";
             }
 
@@ -1365,18 +1365,18 @@ 
             $replace = array('<table border="0" width="100%">', '<tr>');
             $phpinfo = str_replace($strings, $replace, $phpinfo);
         } else {
-            $phpinfo = '<h2>PHP '.phpversion().'</h2>';
+            $phpinfo = '<h2>PHP ' . phpversion() . '</h2>';
         }
         // Create a submenu for filtering PHP information.
-        $form  = '<div id="phpinfo_menu" class="center">'."\n";
-        $form .= '[ <a href="'.$this->getBaseScript().'?op=phpinfo&amp;view=0" title="'.__('PHP Version').'">'.__('PHP Version').'</a> ]';
-        $form .= '[ <a href="'.$this->getBaseScript().'?op=phpinfo&amp;view=4" title="'.__('PHP Core').'">'.__('PHP Core').'</a> ]';
-        $form .= '[ <a href="'.$this->getBaseScript().'?op=phpinfo&amp;view=32" title="'.__('PHP Variables').'">'.__('PHP Variables').'</a> ]';
-        $form .= '[ <a href="'.$this->getBaseScript().'?op=phpinfo&amp;view=64" title="'.__('PHP License').'">'.__('PHP License').'</a> ]'."\n";
+        $form  = '<div id="phpinfo_menu" class="center">' . "\n";
+        $form .= '[ <a href="' . $this->getBaseScript() . '?op=phpinfo&amp;view=0" title="' . __('PHP Version') . '">' . __('PHP Version') . '</a> ]';
+        $form .= '[ <a href="' . $this->getBaseScript() . '?op=phpinfo&amp;view=4" title="' . __('PHP Core') . '">' . __('PHP Core') . '</a> ]';
+        $form .= '[ <a href="' . $this->getBaseScript() . '?op=phpinfo&amp;view=32" title="' . __('PHP Variables') . '">' . __('PHP Variables') . '</a> ]';
+        $form .= '[ <a href="' . $this->getBaseScript() . '?op=phpinfo&amp;view=64" title="' . __('PHP License') . '">' . __('PHP License') . '</a> ]' . "\n";
         $form .= '<br />';
-        $form .= '[ <a href="'.$this->getBaseScript().'?op=phpinfo&amp;view=16" title="'.__('PHP Environment').'">'.__('PHP Environment').'</a> ]';
-        $form .= '[ <a href="'.$this->getBaseScript().'?op=phpinfo&amp;view=8" title="'.__('Apache Environment').'">'.__('Apache Environment').'</a> ]';
-        $form .= '</div>'."\n";
+        $form .= '[ <a href="' . $this->getBaseScript() . '?op=phpinfo&amp;view=16" title="' . __('PHP Environment') . '">' . __('PHP Environment') . '</a> ]';
+        $form .= '[ <a href="' . $this->getBaseScript() . '?op=phpinfo&amp;view=8" title="' . __('Apache Environment') . '">' . __('Apache Environment') . '</a> ]';
+        $form .= '</div>' . "\n";
         // Add previously resulting string to object's markup here.
         $form .= $phpinfo;
         // Return the "form".
@@ -1386,15 +1386,15 @@ 
     public function getMarkedUpOverview()
     {
         // Assemble and return the form markup.
-        $form  = '            <div class="row"><div class="row_left">'.__('Core Version').'</div><div class="row_right">'.$this->siteCodebase.' '.$this->siteVersion.'</div></div>'."\n\n";
-        $form .= '            <div class="row"><div class="row_left">'.__('Config File').'</div><div class="row_right">'.$this->siteConfigFile.'</div></div>'."\n\n";
-        $form .= '            <div class="row"><div class="row_left">'.__('Site Status').'</div><div class="row_right">'.(($this->siteInactive) ? '<img src="images/icons/extrasmall/redled.png" />'.__('Off/Disabled') :'<img src="images/icons/extrasmall/greenled.png" />'.__('On/Enabled')).'</div></div>'."\n\n";
-        $form .= '            <div class="row"><div class="row_left">'.__('Database').'</div><div class="row_right">'.(($this->dbEnabled) ? '<img src="images/icons/extrasmall/greenled.png" />'.__('Connected') : '<img src="images/icons/extrasmall/redled.png" />'.__('Not Connected')).'</div></div>'."\n\n";
-        $form .= '            <div class="row"><div class="row_left">'.__('Site Language').'</div><div class="row_right">'.$this->siteLang.'</div></div>'."\n\n";
-        $form .= '            <div class="row"><div class="row_left">'.__('Detected Themes').'</div><div class="row_right">'.$this->getMarkedUpOverviewThemeList().'</div></div>'."\n\n";
-        $form .= '            <div class="row"><div class="row_left">'.__('Detected Modules').'</div><div class="row_right">'.$this->getMarkedUpOverviewModuleList().'</div></div>'."\n\n";
-        $form .= '            <div class="row"><div class="row_left">'.__('Detected Blocks').'</div><div class="row_right">'.$this->getMarkedUpOverviewBlockList().'</div></div>'."\n\n";
-        $form .= '            <div style="clear:both;"></div>'."\n\n";
+        $form  = '            <div class="row"><div class="row_left">' . __('Core Version') . '</div><div class="row_right">' . $this->siteCodebase . ' ' . $this->siteVersion . '</div></div>' . "\n\n";
+        $form .= '            <div class="row"><div class="row_left">' . __('Config File') . '</div><div class="row_right">' . $this->siteConfigFile . '</div></div>' . "\n\n";
+        $form .= '            <div class="row"><div class="row_left">' . __('Site Status') . '</div><div class="row_right">' . (($this->siteInactive) ? '<img src="images/icons/extrasmall/redled.png" />' . __('Off/Disabled') : '<img src="images/icons/extrasmall/greenled.png" />' . __('On/Enabled')) . '</div></div>' . "\n\n";
+        $form .= '            <div class="row"><div class="row_left">' . __('Database') . '</div><div class="row_right">' . (($this->dbEnabled) ? '<img src="images/icons/extrasmall/greenled.png" />' . __('Connected') : '<img src="images/icons/extrasmall/redled.png" />' . __('Not Connected')) . '</div></div>' . "\n\n";
+        $form .= '            <div class="row"><div class="row_left">' . __('Site Language') . '</div><div class="row_right">' . $this->siteLang . '</div></div>' . "\n\n";
+        $form .= '            <div class="row"><div class="row_left">' . __('Detected Themes') . '</div><div class="row_right">' . $this->getMarkedUpOverviewThemeList() . '</div></div>' . "\n\n";
+        $form .= '            <div class="row"><div class="row_left">' . __('Detected Modules') . '</div><div class="row_right">' . $this->getMarkedUpOverviewModuleList() . '</div></div>' . "\n\n";
+        $form .= '            <div class="row"><div class="row_left">' . __('Detected Blocks') . '</div><div class="row_right">' . $this->getMarkedUpOverviewBlockList() . '</div></div>' . "\n\n";
+        $form .= '            <div style="clear:both;"></div>' . "\n\n";
         return $form;
     }
     // Get marked up theme list for overview page.
@@ -1408,7 +1408,7 @@ 
         }
 
         if (!empty($this->themes['corethemes'])) {
-            $list .= '<strong>'.__('Core Themes').'</strong>';
+            $list .= '<strong>' . __('Core Themes') . '</strong>';
             $list .= $this->getMarkedUpOverviewThemeListReal($this->themes['corethemes']);
         }
 
@@ -1421,11 +1421,11 @@ 
         $list = '<ul>';
         foreach ($themesarray as $theme) {
             if ($theme['name'] === $this->siteTheme) {
-                $list .= '<li><img src="images/icons/extrasmall/greenled.png" alt="'.$theme['name'].' :: '.__('active').'" title="'.$theme['name'].' :: '.__('set as default').'" />';
-            } else if ($theme['state'] == 1){
-                $list .= '<li><img src="images/icons/extrasmall/yellowled.png" alt="'.$theme['name'].' :: '.__('inactive').'" title="'.$theme['name'].' :: '.__('inactive').'" />';
+                $list .= '<li><img src="images/icons/extrasmall/greenled.png" alt="' . $theme['name'] . ' :: ' . __('active') . '" title="' . $theme['name'] . ' :: ' . __('set as default') . '" />';
+            } else if ($theme['state'] == 1) {
+                $list .= '<li><img src="images/icons/extrasmall/yellowled.png" alt="' . $theme['name'] . ' :: ' . __('inactive') . '" title="' . $theme['name'] . ' :: ' . __('inactive') . '" />';
             } else {
-                $list .= '<li><img src="images/icons/extrasmall/redled.png" alt="'.$theme['name'].' :: '.__('uninitialized').'" title="'.$theme['name'].' :: '.__('uninitialized').'" />';
+                $list .= '<li><img src="images/icons/extrasmall/redled.png" alt="' . $theme['name'] . ' :: ' . __('uninitialized') . '" title="' . $theme['name'] . ' :: ' . __('uninitialized') . '" />';
             }
             // Append theme name.
             $list .= $theme['name'] . '</li>';
@@ -1445,9 +1445,9 @@ 
             return $list = __('None Detected');
         }
 
-        $list .= '<strong>'.__('System Modules').'</strong>';
+        $list .= '<strong>' . __('System Modules') . '</strong>';
         $list .= $this->getMarkedUpOverviewModuleListReal($this->modules['sys_mods']);
-        $list .= '<strong>'.__('Value Added Modules').'</strong>';
+        $list .= '<strong>' . __('Value Added Modules') . '</strong>';
         $list .= $this->getMarkedUpOverviewModuleListReal($this->modules['usr_mods']);
         return $list;
     }
@@ -1462,28 +1462,28 @@ 
             foreach ($modsarray as $mod) {
                 // Append module-state image.
                 $list .= '<li>';
-                switch($mod['state']) {
+                switch ($mod['state']) {
                     case ModUtil::STATE_UNINITIALISED:
-                        $list .= '<img src="images/icons/extrasmall/redled.png" alt="'.$mod['name'].' :: '.__('uninitialized').'" title="'.$mod['name'].' :: '.__('uninitialized').'" />';
+                        $list .= '<img src="images/icons/extrasmall/redled.png" alt="' . $mod['name'] . ' :: ' . __('uninitialized') . '" title="' . $mod['name'] . ' :: ' . __('uninitialized') . '" />';
                         break;
                     case ModUtil::STATE_INACTIVE:
-                        $list .= '<img src="images/icons/extrasmall/yellowled.png" alt="'.$mod['name'].' :: '.__('inactive').'" title="'.$mod['name'].' :: '.__('inactive').'" />';
+                        $list .= '<img src="images/icons/extrasmall/yellowled.png" alt="' . $mod['name'] . ' :: ' . __('inactive') . '" title="' . $mod['name'] . ' :: ' . __('inactive') . '" />';
                         break;
                     case ModUtil::STATE_ACTIVE:
-                        $list .= '<img src="images/icons/extrasmall/greenled.png" alt="'.$mod['name'].' :: '.__('active').'" title="'.$mod['name'].' :: '.__('active').'" />';
+                        $list .= '<img src="images/icons/extrasmall/greenled.png" alt="' . $mod['name'] . ' :: ' . __('active') . '" title="' . $mod['name'] . ' :: ' . __('active') . '" />';
                         break;
                     case ModUtil::STATE_MISSING:
-                        $list .= '<img src="images/icons/extrasmall/14_layer_deletelayer.png" alt="'.$mod['name'].' :: '.__('files missing').'" title="'.$mod['name'].' :: '.__('files missing').'" />';
+                        $list .= '<img src="images/icons/extrasmall/14_layer_deletelayer.png" alt="' . $mod['name'] . ' :: ' . __('files missing') . '" title="' . $mod['name'] . ' :: ' . __('files missing') . '" />';
                         break;
                     case ModUtil::STATE_UPGRADED:
-                        $list .= '<img src="images/icons/extrasmall/agt_update-product.png" alt="'.$mod['name'].' :: '.__('upgraded').'" title="'.$mod['name'].' :: '.__('upgraded').'" />';
+                        $list .= '<img src="images/icons/extrasmall/agt_update-product.png" alt="' . $mod['name'] . ' :: ' . __('upgraded') . '" title="' . $mod['name'] . ' :: ' . __('upgraded') . '" />';
                         break;
                     case ModUtil::STATE_INVALID:
                     default:
-                        $list .= '<img src="images/icons/extrasmall/14_layer_deletelayer.png" alt="'.$mod['name'].' :: '.__('invalid').'" title="'.$mod['name'].' :: '.__('invalid').'" />';
+                        $list .= '<img src="images/icons/extrasmall/14_layer_deletelayer.png" alt="' . $mod['name'] . ' :: ' . __('invalid') . '" title="' . $mod['name'] . ' :: ' . __('invalid') . '" />';
                 }
                 // Append module name.
-                $list .= ' '.$mod['name'].'</li>';
+                $list .= ' ' . $mod['name'] . '</li>';
             }
             $list .= '</ul>';
         }
@@ -1503,12 +1503,12 @@ 
         foreach ($this->blocks as $block) {
             // Append module-state image.
             if ($block['active'] == 1) {
-                $list .= '<li><img src="images/icons/extrasmall/greenled.png" alt="'.$block['title'].' :: '.__('active').'" title="'.$block['title'].' :: '.__('active').'" />';
+                $list .= '<li><img src="images/icons/extrasmall/greenled.png" alt="' . $block['title'] . ' :: ' . __('active') . '" title="' . $block['title'] . ' :: ' . __('active') . '" />';
             } else {
-                $list .= '<li><img src="images/icons/extrasmall/yellowled.png" alt="'.$block['title'].' :: '.__('inactive').'" title="'.$block['title'].' :: '.__('inactive').'" />';
+                $list .= '<li><img src="images/icons/extrasmall/yellowled.png" alt="' . $block['title'] . ' :: ' . __('inactive') . '" title="' . $block['title'] . ' :: ' . __('inactive') . '" />';
             }
             // Append block title.
-            $list .= ' '.$block['title'].'</li>';
+            $list .= ' ' . $block['title'] . '</li>';
         }
         $list .= '</ul>';
         // Return markup string.
@@ -1531,7 +1531,7 @@ 
         }
         
         // Call a recovery method based on $this->utility.
-        switch($this->utility) {
+        switch ($this->utility) {
             case 'theme':
                 $success = $this->processRecoveryTheme();
                 break;
@@ -1637,7 +1637,7 @@ 
         }
 
         // Loop through blocks daga.
-        foreach($this->INPUT['blocks'] as $bid=>$action) {
+        foreach ($this->INPUT['blocks'] as $bid=>$action) {
             // Skip to next block if no action specified.
             if (empty($action)) {
                 continue;
@@ -1655,7 +1655,7 @@ 
         }
 
         // Loop through all blocks.
-        foreach($this->INPUT['blocks'] as $bid => $action) {
+        foreach ($this->INPUT['blocks'] as $bid => $action) {
             // Get information about the block.
             $block = ModUtil::apiFunc('Blocks', 'user', 'get', array('bid'=>$bid));
             // Check which action should be performed.
@@ -1663,20 +1663,20 @@ 
                 // Attempt block disable.
                 if (!$this->disableBlock($bid)) {
                     // Set error.
-                    $this->setError(__('Block Not Disabled').': '.$block['title']);
+                    $this->setError(__('Block Not Disabled') . ': ' . $block['title']);
                     continue;
                 }
                 // Set status message.
-                $this->setStatus(__('Block Disabled').': '.$block['title']);
+                $this->setStatus(__('Block Disabled') . ': ' . $block['title']);
             } else if ($action == 2) { // 2 = delete block
                 // Attempt block deletion.
                 if (!$this->deleteBlock($bid)) {
                     // Set error.
-                    $this->setError(__('Block Not Deleted').': '.$block['title']);
+                    $this->setError(__('Block Not Deleted') . ': ' . $block['title']);
                     continue;
                 }
                 // Set status message.
-                $this->setStatus(__('Block Deleted').': '.$block['title']);
+                $this->setStatus(__('Block Deleted') . ': ' . $block['title']);
             }
         }
         // Return false if any errors.
@@ -1727,7 +1727,7 @@ 
         $userscolumn = $table['users_column'];
 
         // check that username exists
-        $uid = DBUtil::selectField('users', 'uid', $userscolumn['uname']."='".$username."'");
+        $uid = DBUtil::selectField('users', 'uid', $userscolumn['uname'] . "='" . $username . "'");
         if (!$uid) {
             $this->setError(__('The username you supplied is not valid'));
             return false;
@@ -1775,9 +1775,9 @@ 
         
         // recreate only the subdirectories that are missing
         if ($this->tempdirexists) {
-            foreach($this->tempdirsubs as $dir => $status) {
+            foreach ($this->tempdirsubs as $dir => $status) {
                 if ($status == 0) {
-                    $result = mkdir($this->tempdir.'/'.$dir, null, true);
+                    $result = mkdir($this->tempdir . '/' . $dir, null, true);
                     if ($result == false) {
                         array_push($dir_errors, $dir);
                     }
@@ -1786,8 +1786,8 @@ 
         }
        // create all subdirectories
         else {
-            foreach($this->tempdirsubs as $dir => $status) {
-                $result = mkdir($this->tempdir.'/'.$dir, null, true);
+            foreach ($this->tempdirsubs as $dir => $status) {
+                $result = mkdir($this->tempdir . '/' . $dir, null, true);
                 if ($result == false) {
                     array_push($dir_errors, $dir);
                 }
@@ -1801,14 +1801,14 @@ 
 
         // create htaccess only if needed
         if (!$this->tempdirexists) {
-            $htaccess_file  = 'SetEnvIf Request_URI "\.css$" object_is_css=css'."\n";
-            $htaccess_file .= 'SetEnvIf Request_URI "\.js$" object_is_js=js'."\n";
-            $htaccess_file .= 'Order deny,allow'."\n";
-            $htaccess_file .= 'Deny from all'."\n";
-            $htaccess_file .= 'Allow from env=object_is_css'."\n";
-            $htaccess_file .= 'Allow from env=object_is_js'."\n";
-
-            $result = FileUtil::writeFile($this->tempdir.'/.htaccess', $htaccess_file);
+            $htaccess_file  = 'SetEnvIf Request_URI "\.css$" object_is_css=css' . "\n";
+            $htaccess_file .= 'SetEnvIf Request_URI "\.js$" object_is_js=js' . "\n";
+            $htaccess_file .= 'Order deny,allow' . "\n";
+            $htaccess_file .= 'Deny from all' . "\n";
+            $htaccess_file .= 'Allow from env=object_is_css' . "\n";
+            $htaccess_file .= 'Allow from env=object_is_js' . "\n";
+
+            $result = FileUtil::writeFile($this->tempdir . '/.htaccess', $htaccess_file);
             if ($result === false) {
                 $this->setError(__f('There was a problem creating .htaccess file. You will have to download it yourself from the <a href="%s">CoZi</a> and place it inside your temp directory', 'https://code.zikula.org/svn/core/branches/zikula-1.3/src/ztemp/.htaccess'));
                 return false;
@@ -1915,7 +1915,7 @@ 
         $obj = array('bid'=>$bid, 'active'=>0);
 
         // Attempt to disable the block.
-        if (!DBUtil::updateObject ($obj, 'blocks', '', 'bid')) {
+        if (!DBUtil::updateObject($obj, 'blocks', '', 'bid')) {
             $this->setError(__('Block Not Disabled'));
             return false;
         }
@@ -1945,7 +1945,7 @@ 
         }
 
         // Delete the block itself.
-        if (!DBUtil::deleteObjectByID ('blocks', $bid, 'bid')) {
+        if (!DBUtil::deleteObjectByID('blocks', $bid, 'bid')) {
             $this->setError(__('Block Not Deleted'));
             return false;
         }
@@ -1968,11 +1968,11 @@ 
 
         // Array of permission objects to insert.
         $perms = array();
-        $perms[] = array('pid'=>1, 'gid'=>2,  'sequence'=>1, 'realm'=>0, 'component'=>'.*',                     'instance'=>'.*',           'level'=>800,   'bond'=>0);
-        $perms[] = array('pid'=>2, 'gid'=>-1, 'sequence'=>2, 'realm'=>0, 'component'=>'ExtendedMenublock::',    'instance'=>'1:2:',         'level'=>0,     'bond'=>0);
-        $perms[] = array('pid'=>3, 'gid'=>1,  'sequence'=>3, 'realm'=>0, 'component'=>'.*',                     'instance'=>'.*',           'level'=>300,   'bond'=>0);
-        $perms[] = array('pid'=>4, 'gid'=>0,  'sequence'=>4, 'realm'=>0, 'component'=>'ExtendedMenublock::',    'instance'=>'1:(1|3):',     'level'=>0,     'bond'=>0);
-        $perms[] = array('pid'=>5, 'gid'=>0,  'sequence'=>5, 'realm'=>0, 'component'=>'.*',                     'instance'=>'.*',           'level'=>200,   'bond'=>0);
+        $perms[] = array('pid'=>1, 'gid'=>2, 'sequence'=>1, 'realm'=>0, 'component'=>'.*', 'instance'=>'.*', 'level'=>800, 'bond'=>0);
+        $perms[] = array('pid'=>2, 'gid'=>-1, 'sequence'=>2, 'realm'=>0, 'component'=>'ExtendedMenublock::', 'instance'=>'1:2:', 'level'=>0, 'bond'=>0);
+        $perms[] = array('pid'=>3, 'gid'=>1, 'sequence'=>3, 'realm'=>0, 'component'=>'.*', 'instance'=>'.*', 'level'=>300, 'bond'=>0);
+        $perms[] = array('pid'=>4, 'gid'=>0, 'sequence'=>4, 'realm'=>0, 'component'=>'ExtendedMenublock::', 'instance'=>'1:(1|3):', 'level'=>0, 'bond'=>0);
+        $perms[] = array('pid'=>5, 'gid'=>0, 'sequence'=>5, 'realm'=>0, 'component'=>'.*', 'instance'=>'.*', 'level'=>200, 'bond'=>0);
 
         // Insert default permissions or fail.
         if (!DBUtil::insertObjectArray($perms, 'group_perms', 'pid')) {
@@ -2007,7 +2007,7 @@ 
     {
         // Header, error content, footer.
         $fatal  = $this->markupHeader();
-        $fatal .= '<div id="fatal">'.(string)$msg.'</div>';
+        $fatal .= '<div id="fatal">' . (string)$msg . '</div>';
         $fatal .= $this->markupFooter();
         // Kill application.
         die ($fatal);

Braces +1 added lines, -2 removed lines

@@ -1072,8 +1072,7 @@
                 } else {
                     if ($outputfilter == 1) {
                         $setting .= 'Your current output filter is set to HTML Purifier + internal mechanism';
-                    }
-                    else {
+                    } else {
                         $setting .= 'Unable to determine your current output filter setting';
                     }
                 }

tools/overrides.yml.php

Spacing +11 added lines, -11 removed lines

@@ -21,7 +21,7 @@ 
 
 $theme = $argv[1];
 
-if (!file_exists('themes/'.$theme)) {
+if (!file_exists('themes/' . $theme)) {
     die("Theme does not exist!\n");
 }
 
@@ -41,9 +41,9 @@ 
     if ($handle = opendir($directory)) {
         while (false !== ($file = readdir($handle))) {
             if ($file != "." && $file != "..") {
-                if (is_dir($directory. "/" . $file)) {
-                    if($recursive) {
-                        $array_items = array_merge($array_items, directoryToArray($directory. "/" . $file, $recursive));
+                if (is_dir($directory . "/" . $file)) {
+                    if ($recursive) {
+                        $array_items = array_merge($array_items, directoryToArray($directory . "/" . $file, $recursive));
                     }
                     $file = $directory . "/" . $file;
                     $array_items[] = preg_replace("/\/\//si", "/", $file);
@@ -59,7 +59,7 @@ 
     return $array_items;
 }
 
-$files = directoryToArray("./themes/".$theme."/templates/modules", true);
+$files = directoryToArray("./themes/" . $theme . "/templates/modules", true);
 
 $output  = "## YAML Override template\n";
 $output .= "## original/file.tpl: override/file.tpl\n";
@@ -70,7 +70,7 @@ 
         continue;
     }
     $target = substr($file, 2);
-    $origine = str_replace('themes/'.$theme.'/templates/modules/', '', $target);
+    $origine = str_replace('themes/' . $theme . '/templates/modules/', '', $target);
     $array = explode('/', $origine);
     if (!isset($array[0])) {
         continue;
@@ -78,12 +78,12 @@ 
     $modname = $array[0];
     unset($array[0]);
     $origine = implode('/', $array);
-    if (is_dir('system/'.$modname)) {
-        $origine = 'system/'.$modname.'/templates/'.$origine;
+    if (is_dir('system/' . $modname)) {
+        $origine = 'system/' . $modname . '/templates/' . $origine;
     } else {
-        $origine = 'modules/'.$modname.'/templates/'.$origine;
+        $origine = 'modules/' . $modname . '/templates/' . $origine;
     }
-    $output .= $origine.': '.$target."\n";
+    $output .= $origine . ': ' . $target . "\n";
 }
 
 // write file
@@ -94,6 +94,6 @@ 
 fwrite($fh, $output);
 fclose($fh);
 
-echo 'Done. The file '.$override.' was created succesfully! Please move this file now to themes/'.$theme.'/templates/';
+echo 'Done. The file ' . $override . ' was created succesfully! Please move this file now to themes/' . $theme . '/templates/';
 
 ?>
\ No newline at end of file

tools/12x-to-13x-Conversion/replace.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
     public function validateInputArgument($argv)
     {    
         if (empty($argv[1])) {
-            echo 'Usage: '.$argv[0].' [/path/to/module_or_theme_or_file]'.PHP_EOL;
+            echo 'Usage: ' . $argv[0] . ' [/path/to/module_or_theme_or_file]' . PHP_EOL;
             die();
         }
 
@@ -108,10 +108,10 @@ 
             $this->migrateModuleOrTheme($this->_input);
         } else if ($this->isPHPFile($this->_input)) {
             $this->migratePhpFile($this->_input);
-        } else if($this->isTemplate($this->_input)) {
+        } else if ($this->isTemplate($this->_input)) {
             $this->migrateTemplate($this->_input);
         } else {
-            echo $this->_input.' is not a directory, a php file or a template file.'.PHP_EOL;
+            echo $this->_input . ' is not a directory, a php file or a template file.' . PHP_EOL;
             die();
         }
     }
@@ -126,11 +126,11 @@ 
     public function migrateModuleOrTheme($input)
     {
         $objects = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($input), RecursiveIteratorIterator::SELF_FIRST);
-        foreach($objects as $name => $object) {
+        foreach ($objects as $name => $object) {
             if (strpos($name, '.svn/') === false && strpos($name, '.git/') === false) {
                 if ($this->isPHPFile($name)) {
                     $this->migratePhpFile($name);
-                } else if($this->isTemplate($name)) {
+                } else if ($this->isTemplate($name)) {
                     $this->migrateTemplate($name);
                 }
             }

tools/pntablesToXML.php

Indentation +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 
     foreach ($columnArray as $alias=>$dbColumn) {
         if (!isset($columnArrayDef[$alias])) { // skip calculated/math fields
-           continue;
+            continue;
         } 
         $columnXML = $tableXML->addChild('column');
         $columnXML->addAttribute ('name', $alias);

Spacing +45 added lines, -45 removed lines

@@ -41,7 +41,7 @@ 
 if (!$data) {
     exit ("Error reading file [$fileIn]\n");
 } 
-$lines   = explode("\n", $data);
+$lines = explode("\n", $data);
 
 
 //
@@ -49,16 +49,16 @@ 
 //
 $modName = null;
 foreach ($lines as $line) {
-    $line = str_replace ("\t", ' ', $line);
-    $line = str_replace ('  ', ' ', $line);
-    if (strpos ($line, 'function ') !== false && strpos ($line, '()') != false) {
-        $fields  = explode (' ', $line);
-        $nFields = count ($fields);
+    $line = str_replace("\t", ' ', $line);
+    $line = str_replace('  ', ' ', $line);
+    if (strpos($line, 'function ') !== false && strpos($line, '()') != false) {
+        $fields  = explode(' ', $line);
+        $nFields = count($fields);
         if ($nFields < 2) {
             exit ("Expected at least 2 fields for function declaration but found [$nFields]\n");
         } 
 
-        $fields  = explode ('_', $fields[1]);
+        $fields  = explode('_', $fields[1]);
         $modname = $fields[0];
         break;
     } 
@@ -84,7 +84,7 @@ 
 //
 $xml = new SimpleXMLElement('<tables></tables>');
 foreach ($data as $table => $tableWithPrefix) {
-    if (strpos($table, '_column') !== false || strpos($table, 'column_def') !== false || strpos ($table, 'column_idx') !== false) {
+    if (strpos($table, '_column') !== false || strpos($table, 'column_def') !== false || strpos($table, 'column_idx') !== false) {
         continue;
     }
 
@@ -122,27 +122,27 @@ 
     $columnArray    = $data[$columnArrayIdx];
     $columnArrayDef = $data[$columnArrayDefIdx];
     $tableXML = $xml->addChild('table');
-    $tableXML->addAttribute ('name', $table);
+    $tableXML->addAttribute('name', $table);
     if ($primaryKeyColumn) {
-        $tableXML->addAttribute ('primaryKey', $primaryKeyColumn);
+        $tableXML->addAttribute('primaryKey', $primaryKeyColumn);
     } 
-    $tableXML->addAttribute ('enableCategorization', $enableCategorization);
-    $tableXML->addAttribute ('enableAttribution', $enableAttribution);
+    $tableXML->addAttribute('enableCategorization', $enableCategorization);
+    $tableXML->addAttribute('enableAttribution', $enableAttribution);
 
     foreach ($columnArray as $alias=>$dbColumn) {
         if (!isset($columnArrayDef[$alias])) { // skip calculated/math fields
            continue;
         } 
         $columnXML = $tableXML->addChild('column');
-        $columnXML->addAttribute ('name', $alias);
-        $columnXML->addAttribute ('dbname', $dbColumn);
-        $type = ConversionUtil::parseType ($columnArrayDef[$alias]);
-        $columnXML->addAttribute ('type', $type['type']);
-        $columnXML->addAttribute ('length', $type['length']);
-        $columnXML->addAttribute ('nullable', $type['nullable']);
-        $columnXML->addAttribute ('default', $type['default']);
-        $columnXML->addAttribute ('autoincrement', $type['autoincrement']);
-        $columnXML->addAttribute ('primary', $type['primary']);
+        $columnXML->addAttribute('name', $alias);
+        $columnXML->addAttribute('dbname', $dbColumn);
+        $type = ConversionUtil::parseType($columnArrayDef[$alias]);
+        $columnXML->addAttribute('type', $type['type']);
+        $columnXML->addAttribute('length', $type['length']);
+        $columnXML->addAttribute('nullable', $type['nullable']);
+        $columnXML->addAttribute('default', $type['default']);
+        $columnXML->addAttribute('autoincrement', $type['autoincrement']);
+        $columnXML->addAttribute('primary', $type['primary']);
     } 
 
     if (isset($data[$columnArrayIdxIdx])) {
@@ -153,14 +153,14 @@ 
                 foreach ($indexDef as $field) {
                     $t[] = $data[$columnArrayIdx][$field];
                 } 
-                $_indexDef = implode (',', $t);
+                $_indexDef = implode(',', $t);
                 $columnXML = $tableXML->addChild('index');
-                $columnXML->addAttribute ('name', $indexName);
-                $columnXML->addAttribute ('fields', $_indexDef);
+                $columnXML->addAttribute('name', $indexName);
+                $columnXML->addAttribute('fields', $_indexDef);
             } else {
                 $columnXML = $tableXML->addChild('index');
-                $columnXML->addAttribute ('name', $indexName);
-                $columnXML->addAttribute ('fields', $indexDef);
+                $columnXML->addAttribute('name', $indexName);
+                $columnXML->addAttribute('fields', $indexDef);
             }
         } 
     } 
@@ -188,7 +188,7 @@ 
 // save or echo results
 //
 if ($fileOut) {
-    file_put_contents ($fileOut, $xmlText);
+    file_put_contents($fileOut, $xmlText);
 } else {
     print $xmlText;
 }
@@ -202,12 +202,12 @@ 
 /* ********************************************************* */
 class ConversionUtil 
 {
-    public static function parseType ($typeString) 
+    public static function parseType($typeString) 
     { 
         $type       = array();
         $typeString = preg_replace('/\s\s+/', ' ', $typeString);
-        $fields     = explode (' ', $typeString);
-        $nFields    = count ($fields);
+        $fields     = explode(' ', $typeString);
+        $nFields    = count($fields);
 
         $typemap    = array();
         $typemap['C']  = 'VARCHAR';
@@ -229,14 +229,14 @@ 
         $typemap['F']  = 'FLOAT';
         $typemap['N']  = 'NUMERIC';
 
-        for ($c=0; $c<$nFields; $c++) {
+        for ($c = 0; $c < $nFields; $c++) {
             if ($c == 0) {
                 if (strpos($fields[$c], '(') !== false) {
-                    $pos1    = strpos ($fields[0], '(');
-                    $pos2    = strpos ($fields[0], ')');
-                    $fType   = substr ($fields[0], 0, $pos1);
+                    $pos1    = strpos($fields[0], '(');
+                    $pos2    = strpos($fields[0], ')');
+                    $fType   = substr($fields[0], 0, $pos1);
                     $fType   = $typemap[$fType];
-                    $fLength = substr ($fields[0], $pos1+1, $pos2-$pos1-1);
+                    $fLength = substr($fields[0], $pos1 + 1, $pos2 - $pos1 - 1);
                     $type['type']   = $fType;
                     $type['length'] = $fLength;
                 } else {
@@ -261,21 +261,21 @@ 
                 }
 
                 if ($fields[$c] == 'DEFAULT') {
-                    if ($nFields > $c+2) {
-                        $type['default'] = $fields[$c+1] . ' ' . $fields[$c+2];
-                        $c+=2;
+                    if ($nFields > $c + 2) {
+                        $type['default'] = $fields[$c + 1] . ' ' . $fields[$c + 2];
+                        $c += 2;
                     } else {
-                        $type['default'] = $fields[$c+1];
-                        $c+=1;
+                        $type['default'] = $fields[$c + 1];
+                        $c += 1;
                     }
                 }
             }
         }
 
-        if (!isset($type['nullable']))       { $type['nullable']      = 'true'; }
-        if (!isset($type['autoincrement']))  { $type['autoincrement'] = 'false'; }
-        if (!isset($type['default']))        { $type['default']       = ''; }
-        if (!isset($type['primary']))        { $type['primary']       = 'false'; }
+        if (!isset($type['nullable'])) { $type['nullable']      = 'true'; }
+        if (!isset($type['autoincrement'])) { $type['autoincrement'] = 'false'; }
+        if (!isset($type['default'])) { $type['default']       = ''; }
+        if (!isset($type['primary'])) { $type['primary']       = 'false'; }
 
         return $type;
     }
@@ -284,7 +284,7 @@ 
 
 class DBUtil 
 {
-    public static function getLimitedTablename ($table) 
+    public static function getLimitedTablename($table) 
     {
         return $table;
     } 

Braces +3 added lines, -2 removed lines

@@ -298,8 +298,9 @@
         // ensure correct handling of prefix with and without underscore
         if ($col_prefix) {
             $plen = strlen($col_prefix);
-            if ($col_prefix[$plen - 1] != '_')
-                $col_prefix .= '_';
+            if ($col_prefix[$plen - 1] != '_') {
+                            $col_prefix .= '_';
+            }
         }
 
         // add standard fields

build.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
             'composer-plugin' => 'Composer Plugins'
         ];
         $types = array_keys($typeOrder);
-        usort($packages, function ($a, $b) use ($types) {
+        usort($packages, function($a, $b) use ($types) {
             return array_search($a['type'], $types) - array_search($b['type'], $types);
         });
 

src/app/ZikulaKernel.php

Spacing +4 added lines, -4 removed lines

@@ -92,10 +92,10 @@
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load($this->rootDir.'/config/config_'.$this->getEnvironment().'.yml');
-        $loader->load($this->rootDir.'/config/parameters.yml');
-        if (is_readable($this->rootDir.'/config/custom_parameters.yml')) {
-            $loader->load($this->rootDir.'/config/custom_parameters.yml');
+        $loader->load($this->rootDir . '/config/config_' . $this->getEnvironment() . '.yml');
+        $loader->load($this->rootDir . '/config/parameters.yml');
+        if (is_readable($this->rootDir . '/config/custom_parameters.yml')) {
+            $loader->load($this->rootDir . '/config/custom_parameters.yml');
         }
 
         if (!is_readable($this->rootDir . '/config/' . DynamicConfigDumper::CONFIG_GENERATED)) {

src/app/autoload.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 /**
  * @var ClassLoader
  */
-$loader = require __DIR__.'/../vendor/autoload.php';
+$loader = require __DIR__ . '/../vendor/autoload.php';
 
 AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 AnnotationReader::addGlobalIgnoredName('type');

src/lib/bootstrap.php

Spacing +6 added lines, -6 removed lines

@@ -12,12 +12,12 @@ 
 use Symfony\Component\Debug\Debug;
 use Symfony\Component\Yaml\Yaml;
 
-require __DIR__.'/../app/autoload.php';
-require __DIR__.'/../app/ZikulaKernel.php';
-require __DIR__.'/../lib/requirementCheck.php';
+require __DIR__ . '/../app/autoload.php';
+require __DIR__ . '/../app/ZikulaKernel.php';
+require __DIR__ . '/../lib/requirementCheck.php';
 
-$kernelConfig = Yaml::parse(file_get_contents(__DIR__.'/../app/config/parameters.yml'));
-if (is_readable($file = __DIR__.'/../app/config/custom_parameters.yml')) {
+$kernelConfig = Yaml::parse(file_get_contents(__DIR__ . '/../app/config/parameters.yml'));
+if (is_readable($file = __DIR__ . '/../app/config/custom_parameters.yml')) {
     $kernelConfig = array_merge($kernelConfig, Yaml::parse(file_get_contents($file)));
 }
 $kernelConfig = $kernelConfig['parameters'];
@@ -36,4 +36,4 @@ 
 $kernel->boot();
 
 // legacy handling
-require __DIR__.'/core.php';
+require __DIR__ . '/core.php';