evolution-cms / evolution

install/actions/action_summary.php

Spacing +78 added lines, -78 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! function_exists('f_owc')){
+if (!function_exists('f_owc')) {
     /**
      * @param $path
      * @param $data
@@ -12,30 +12,30 @@ 
             fwrite($hnd, $data);
             fclose($hnd);
 
-            if(null !== $mode) chmod($path, $mode);
-        }catch(Exception $e){
+            if (null !== $mode) chmod($path, $mode);
+        } catch (Exception $e) {
             // Nothing, this is NOT normal
             unset($e);
         }
     }
 }
 
-$installMode = isset($_POST['installmode']) ? (int)$_POST['installmode'] : 0;
-if( ! isset($_lang)) $_lang = array();
+$installMode = isset($_POST['installmode']) ? (int) $_POST['installmode'] : 0;
+if (!isset($_lang)) $_lang = array();
 
 echo '<div class="stepcontainer">
       <ul class="progressbar">
-          <li class="visited">' . $_lang['choose_language'] . '</li>
-          <li class="visited">' . $_lang['installation_mode'] . '</li>
-          <li class="visited">' . $_lang['optional_items'] . '</li>
-          <li class="active">' . $_lang['preinstall_validation'] . '</li>
-          <li>' . $_lang['install_results'] . '</li>
+          <li class="visited">' . $_lang['choose_language'].'</li>
+          <li class="visited">' . $_lang['installation_mode'].'</li>
+          <li class="visited">' . $_lang['optional_items'].'</li>
+          <li class="active">' . $_lang['preinstall_validation'].'</li>
+          <li>' . $_lang['install_results'].'</li>
   </ul>
   <div class="clearleft"></div>
 </div>';
 
-echo '<h2>' . $_lang['preinstall_validation'] . '</h2>';
-echo '<h3>' . $_lang['summary_setup_check'] . '</h3>';
+echo '<h2>'.$_lang['preinstall_validation'].'</h2>';
+echo '<h3>'.$_lang['summary_setup_check'].'</h3>';
 
 $errors = 0;
 
@@ -43,73 +43,73 @@ 
 // check PHP version
 define('PHP_MIN_VERSION', '5.4.0');
 $phpMinVersion = PHP_MIN_VERSION; // Maybe not necessary. For backward compatibility
-echo '<p>' . $_lang['checking_php_version'];
+echo '<p>'.$_lang['checking_php_version'];
 // -1 if left is less, 0 if equal, +1 if left is higher
 if (version_compare(phpversion(), PHP_MIN_VERSION) < 0) {
     $errors++;
-    $tmp = $_lang['you_running_php'] . phpversion() . str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
-    echo '<span class="notok">' . $_lang['failed'] . '</span>' . $tmp . '</p>';
+    $tmp = $_lang['you_running_php'].phpversion().str_replace('[+min_version+]', PHP_MIN_VERSION, $_lang["modx_requires_php"]);
+    echo '<span class="notok">'.$_lang['failed'].'</span>'.$tmp.'</p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // check if iconv is available
-echo '<p>' . $_lang['checking_iconv'];
+echo '<p>'.$_lang['checking_iconv'];
 $iconv = (int) function_exists('iconv');
-if ($iconv == '0'){
-    echo '<span class="notok">' . $_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
+if ($iconv == '0') {
+    echo '<span class="notok">'.$_lang['failed'].'</span></p><p><strong>'.$_lang['checking_iconv_note'].'</strong></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 // check sessions
-echo '<p>' . $_lang['checking_sessions'];
+echo '<p>'.$_lang['checking_sessions'];
 if ($_SESSION['test'] != 1) {
-    echo '<span class="notok">' . $_lang['failed'].  '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // check directories
 // cache exists?
-echo '<p>' . $_lang['checking_if_cache_exist'];
+echo '<p>'.$_lang['checking_if_cache_exist'];
 if (!file_exists("../assets/cache") || !file_exists("../assets/cache/rss")) {
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
     $errors++;
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // cache writable?
-echo '<p>' . $_lang['checking_if_cache_writable'];
+echo '<p>'.$_lang['checking_if_cache_writable'];
 if (!is_writable("../assets/cache")) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
-    echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+    echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 // cache files writable?
-echo '<p>' . $_lang['checking_if_cache_file_writable'];
+echo '<p>'.$_lang['checking_if_cache_file_writable'];
 $tmp = "../assets/cache/siteCache.idx.php";
-if ( ! file_exists($tmp)) {
+if (!file_exists($tmp)) {
     f_owc($tmp, "<?php //EVO site cache file ?>");
 }
-if ( ! is_writable($tmp)) {
+if (!is_writable($tmp)) {
     $errors++;
-    echo '<span class="notok">' . $_lang['failed'] . '</span></p>';
+    echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
     echo '<span class="ok">'.$_lang['ok'].'</span></p>';
 }
 
 
 echo '<p>'.$_lang['checking_if_cache_file2_writable'];
-if ( ! is_writable("../assets/cache/sitePublishing.idx.php")) {
+if (!is_writable("../assets/cache/sitePublishing.idx.php")) {
     $errors++;
     echo '<span class="notok">'.$_lang['failed'].'</span></p>';
 } else {
@@ -119,7 +119,7 @@ 
 
 // File Browser directories exists?
 echo '<p>'.$_lang['checking_if_images_exist'];
-switch(true){
+switch (true) {
     case !file_exists("../assets/images"):
     case !file_exists("../assets/files"):
     case !file_exists("../assets/backup"):
@@ -134,7 +134,7 @@ 
 
 // File Browser directories writable?
 echo '<p>'.$_lang['checking_if_images_writable'];
-switch(true){
+switch (true) {
     case !is_writable("../assets/images"):
     case !is_writable("../assets/files"):
     case !is_writable("../assets/backup"):
@@ -194,7 +194,7 @@ 
     $database_charset = substr($database_collation, 0, strpos($database_collation, '_') - 1);
     $database_connection_charset = $_POST['database_connection_charset'];
     $database_connection_method = $_POST['database_connection_method'];
-    $dbase = '`' . $_POST['database_name'] . '`';
+    $dbase = '`'.$_POST['database_name'].'`';
     $table_prefix = $_POST['tableprefix'];
 }
 echo '<p>'.$_lang['creating_database_connection'];
@@ -234,54 +234,54 @@ 
 
 // check table prefix
 if ($conn && $installMode == 0) {
-    echo '<p>' . $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if ($rs= mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_already_inuse'] . '</p>';
+    echo '<p>'.$_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if ($rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed'].'</span></b>'.$_lang['table_prefix_already_inuse'].'</p>';
         $errors++;
-        echo "<p>" . $_lang['table_prefix_already_inuse_note'] . '</p>';
+        echo "<p>".$_lang['table_prefix_already_inuse_note'].'</p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 } elseif ($conn && $installMode == 2) {
-    echo '<p>' . $_lang['checking_table_prefix'] . $table_prefix . '`: ';
-    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . '</span></b>' . $_lang['table_prefix_not_exist'] . '</p>';
+    echo '<p>'.$_lang['checking_table_prefix'].$table_prefix.'`: ';
+    if (!$rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed'].'</span></b>'.$_lang['table_prefix_not_exist'].'</p>';
         $errors++;
-        echo '<p>' . $_lang['table_prefix_not_exist_note'] . '</p>';
+        echo '<p>'.$_lang['table_prefix_not_exist_note'].'</p>';
   } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
   }
 }
 
 // check mysql version
 if ($conn) {
-    echo '<p>' . $_lang['checking_mysql_version'];
-    if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) {
-        echo '<span class="notok">'  . $_lang['warning'] . '</span></b>&nbsp;&nbsp;<strong>' . $_lang['mysql_5051'] . '</strong></p>';
-        echo '<p><span class="notok">' . $_lang['mysql_5051_warning'] . '</span></p>';
+    echo '<p>'.$_lang['checking_mysql_version'];
+    if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) {
+        echo '<span class="notok">'.$_lang['warning'].'</span></b>&nbsp;&nbsp;<strong>'.$_lang['mysql_5051'].'</strong></p>';
+        echo '<p><span class="notok">'.$_lang['mysql_5051_warning'].'</span></p>';
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span>&nbsp;&nbsp;<strong>' . $_lang['mysql_version_is'] . mysqli_get_server_info($conn) . '</strong></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span>&nbsp;&nbsp;<strong>'.$_lang['mysql_version_is'].mysqli_get_server_info($conn).'</strong></p>';
     }
 }
 
 // check for strict mode
 if ($conn) {
-    echo '<p>'. $_lang['checking_mysql_strict_mode'];
+    echo '<p>'.$_lang['checking_mysql_strict_mode'];
     $mysqlmode = mysqli_query($conn, "SELECT @@global.sql_mode");
-    if (mysqli_num_rows($mysqlmode) > 0){
+    if (mysqli_num_rows($mysqlmode) > 0) {
         $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM);
         //$modes = array("STRICT_TRANS_TABLES"); // for testing
         // print_r($modes);
         foreach ($modes as $mode) {
             if (stristr($mode, "STRICT_TRANS_TABLES") !== false || stristr($mode, "STRICT_ALL_TABLES") !== false) {
-                echo '<span class="notok">' . $_lang['warning'] . '</span></b> <strong>&nbsp;&nbsp;' . $_lang['strict_mode'] . '</strong></p>';
-                echo '<p><span class="notok">' . $_lang['strict_mode_error'] . '</span></p>';
+                echo '<span class="notok">'.$_lang['warning'].'</span></b> <strong>&nbsp;&nbsp;'.$_lang['strict_mode'].'</strong></p>';
+                echo '<p><span class="notok">'.$_lang['strict_mode_error'].'</span></p>';
             } else {
-                echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+                echo '<span class="ok">'.$_lang['ok'].'</span></p>';
             }
         }
     } else {
-        echo '<span class="ok">' . $_lang['ok'] . '</span></p>';
+        echo '<span class="ok">'.$_lang['ok'].'</span></p>';
     }
 }
 // Version and strict mode check end
@@ -297,18 +297,18 @@ 
     f_owc("../assets/cache/installProc.inc.php", '<?php $installStartTime = '.time().'; ?>');
 }
 
-if($installMode > 0 && $_POST['installdata'] == "1") {
-    echo '<p class="notes"><strong>' . $_lang['sample_web_site'] . ':</strong> ' . $_lang['sample_web_site_note'] . '</p>';
+if ($installMode > 0 && $_POST['installdata'] == "1") {
+    echo '<p class="notes"><strong>'.$_lang['sample_web_site'].':</strong> '.$_lang['sample_web_site_note'].'</p>';
 }
 
 if ($errors > 0) {
     echo '<p>';
-    echo $_lang['setup_cannot_continue'] . ' ';
+    echo $_lang['setup_cannot_continue'].' ';
 
-    if($errors > 1){
-        echo $errors . " " . $_lang['errors'] . $_lang['please_correct_errors'] . $_lang['and_try_again_plural'];
-    }else{
-        echo $_lang['error'] . $_lang['please_correct_error'] . $_lang['and_try_again'];
+    if ($errors > 1) {
+        echo $errors." ".$_lang['errors'].$_lang['please_correct_errors'].$_lang['and_try_again_plural'];
+    } else {
+        echo $_lang['error'].$_lang['please_correct_error'].$_lang['and_try_again'];
     }
 
     echo $_lang['visit_forum'];
@@ -317,10 +317,10 @@ 
 
 echo '<p>&nbsp;</p>';
 
-$nextAction= $errors > 0 ? 'summary' : 'install';
-$nextButton= $errors > 0 ? $_lang['retry'] : $_lang['install'];
-$nextVisibility= $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
-$agreeToggle= $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
+$nextAction = $errors > 0 ? 'summary' : 'install';
+$nextButton = $errors > 0 ? $_lang['retry'] : $_lang['install'];
+$nextVisibility = $errors > 0 || isset($_POST['chkagree']) ? 'visible' : 'hidden';
+$agreeToggle = $errors > 0 ? '' : ' onclick="if(document.getElementById(\'chkagree\').checked){document.getElementById(\'nextbutton\').style.visibility=\'visible\';}else{document.getElementById(\'nextbutton\').style.visibility=\'hidden\';}"';
 ?>
 <form name="install" id="install_form" action="index.php?action=<?php echo $nextAction ?>" method="post">
   <div>
@@ -342,32 +342,32 @@ 
 
     <input type="hidden" value="<?php echo $_POST['installdata'] ?>" name="installdata" />
 <?php
-    $templates = isset ($_POST['template']) ? $_POST['template'] : array ();
+    $templates = isset ($_POST['template']) ? $_POST['template'] : array();
     foreach ($templates as $i => $template) echo '<input type="hidden" name="template[]" value="'.$template.'" />';
 
-    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array ();
+    $tvs = isset ($_POST['tv']) ? $_POST['tv'] : array();
     foreach ($tvs as $i => $tv) echo '<input type="hidden" name="tv[]" value="'.$tv.'" />';
 
-    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array ();
+    $chunks = isset ($_POST['chunk']) ? $_POST['chunk'] : array();
     foreach ($chunks as $i => $chunk) echo '<input type="hidden" name="chunk[]" value="'.$chunk.'" />';
 
-    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array ();
+    $snippets = isset ($_POST['snippet']) ? $_POST['snippet'] : array();
     foreach ($snippets as $i => $snippet) echo '<input type="hidden" name="snippet[]" value="'.$snippet.'" />';
 
-    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array ();
+    $plugins = isset ($_POST['plugin']) ? $_POST['plugin'] : array();
     foreach ($plugins as $i => $plugin) echo '<input type="hidden" name="plugin[]" value="'.$plugin.'" />';
 
-    $modules = isset ($_POST['module']) ? $_POST['module'] : array ();
+    $modules = isset ($_POST['module']) ? $_POST['module'] : array();
     foreach ($modules as $i => $module) echo '<input type="hidden" name="module[]" value="'.$module.'" />';
 ?>
 </div>
 
-<h2><?php echo $_lang['agree_to_terms'];?></h2>
+<h2><?php echo $_lang['agree_to_terms']; ?></h2>
 <p>
-<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ':""; ?><?php echo $agreeToggle;?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
+<input type="checkbox" value="1" id="chkagree" name="chkagree" style="line-height:18px" <?php echo isset($_POST['chkagree']) ? 'checked="checked" ' : ""; ?><?php echo $agreeToggle; ?>/><label for="chkagree" style="display:inline;float:none;line-height:18px;"> <?php echo $_lang['iagree_box']?> </label>
 </p>
     <p class="buttonlinks">
         <a href="javascript:document.getElementById('install_form').action='index.php?action=options&language=<?php echo $install_language?>';document.getElementById('install_form').submit();" class="prev" title="<?php echo $_lang['btnback_value']?>"><span><?php echo $_lang['btnback_value']?></span></a>
-        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility;?>"><span><?php echo $nextButton ?></span></a>
+        <a id="nextbutton" href="javascript:document.getElementById('install_form').submit();" title="<?php echo $nextButton ?>" style="visibility:<?php echo $nextVisibility; ?>"><span><?php echo $nextButton ?></span></a>
     </p>
 </form>

manager/media/rss/rss_utils.inc

Spacing +12 added lines, -12 removed lines

@@ -22,35 +22,35 @@
     NOTE: http://www.w3.org/TR/NOTE-datetime
 \*======================================================================*/
 
-function parse_w3cdtf ( $date_str ) {
+function parse_w3cdtf($date_str){
 
     # regex to match wc3dtf
     $pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
 
-    if ( preg_match( $pat, $date_str, $match ) ) {
-        list( $year, $month, $day, $hours, $minutes, $seconds) =
-            array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
+    if (preg_match($pat, $date_str, $match)) {
+        list($year, $month, $day, $hours, $minutes, $seconds) =
+            array($match[1], $match[2], $match[3], $match[4], $match[5], $match[6]);
 
         # calc epoch for current date assuming GMT
-        $epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
+        $epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
 
         $offset = 0;
-        if ( $match[10] == 'Z' ) {
+        if ($match[10] == 'Z') {
             # zulu time, aka GMT
         }
         else {
-            list( $tz_mod, $tz_hour, $tz_min ) =
-                array( $match[8], $match[9], $match[10]);
+            list($tz_mod, $tz_hour, $tz_min) =
+                array($match[8], $match[9], $match[10]);
 
             # zero out the variables
-            if ( ! $tz_hour ) { $tz_hour = 0; }
-            if ( ! $tz_min ) { $tz_min = 0; }
+            if (!$tz_hour) { $tz_hour = 0; }
+            if (!$tz_min) { $tz_min = 0; }
 
-            $offset_secs = (($tz_hour*60)+$tz_min)*60;
+            $offset_secs = (($tz_hour * 60) + $tz_min) * 60;
 
             # is timezone ahead of GMT?  then subtract offset
             #
-            if ( $tz_mod == '+' ) {
+            if ($tz_mod == '+') {
                 $offset_secs = $offset_secs * -1;
             }
 

manager/media/rss/rss_fetch.inc

Spacing +79 added lines, -79 removed lines

@@ -24,19 +24,19 @@ 
 }
 
 if (!defined('MAGPIE_DIR')) {
-    define('MAGPIE_DIR', dirname(__FILE__) . DIR_SEP);
+    define('MAGPIE_DIR', dirname(__FILE__).DIR_SEP);
 }
 
 if (!defined('MAGPIE_CACHE_DIR')) {
-    define('MAGPIE_CACHE_DIR', MODX_BASE_PATH . 'assets/cache/rss');
+    define('MAGPIE_CACHE_DIR', MODX_BASE_PATH.'assets/cache/rss');
 }
 
-require_once( MAGPIE_DIR . 'rss_parse.inc' );
-require_once( MAGPIE_DIR . 'rss_cache.inc' );
+require_once(MAGPIE_DIR.'rss_parse.inc');
+require_once(MAGPIE_DIR.'rss_cache.inc');
 
 // for including 3rd party libraries
-define('MAGPIE_EXTLIB', MAGPIE_DIR . 'extlib' . DIR_SEP);
-require_once( MAGPIE_EXTLIB . 'Snoopy.class.inc');
+define('MAGPIE_EXTLIB', MAGPIE_DIR.'extlib'.DIR_SEP);
+require_once(MAGPIE_EXTLIB.'Snoopy.class.inc');
 
 
 /*
@@ -89,21 +89,21 @@ 
 
 $MAGPIE_ERROR = "";
 
-function fetch_rss ($url) {
+function fetch_rss($url){
     // initialize constants
     init();
 
-    if ( !isset($url) ) {
+    if (!isset($url)) {
         error("fetch_rss called without a url");
         return false;
     }
 
     // if cache is disabled
-    if ( !MAGPIE_CACHE_ON ) {
+    if (!MAGPIE_CACHE_ON) {
         // fetch file, and parse it
-        $resp = _fetch_remote_file( $url );
-        if ( is_success( $resp->status ) ) {
-            return _response_to_rss( $resp );
+        $resp = _fetch_remote_file($url);
+        if (is_success($resp->status)) {
+            return _response_to_rss($resp);
         }
         else {
             error("Failed to fetch $url and cache is off");
@@ -118,34 +118,34 @@ 
         // 3. if cached obj fails freshness check, fetch remote
         // 4. if remote fails, return stale object, or error
 
-        $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+        $cache = new RSSCache(MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE);
 
         if (MAGPIE_DEBUG and $cache->ERROR) {
             debug($cache->ERROR, E_USER_WARNING);
         }
 
 
-        $cache_status    = 0;       // response of check_cache
+        $cache_status    = 0; // response of check_cache
         $request_headers = array(); // HTTP headers to send with fetch
-        $rss             = 0;       // parsed RSS object
-        $errormsg        = 0;       // errors, if any
+        $rss             = 0; // parsed RSS object
+        $errormsg        = 0; // errors, if any
 
         // store parsed XML by desired output encoding
         // as character munging happens at parse time
-        $cache_key       = $url . MAGPIE_OUTPUT_ENCODING;
+        $cache_key = $url.MAGPIE_OUTPUT_ENCODING;
 
         if (!$cache->ERROR) {
             // return cache HIT, MISS, or STALE
-            $cache_status = $cache->check_cache( $cache_key);
+            $cache_status = $cache->check_cache($cache_key);
         }
 
         // if object cached, and cache is fresh, return cached obj
-        if ( $cache_status == 'HIT' ) {
-            $rss = $cache->get( $cache_key );
-            if ( isset($rss) and $rss ) {
+        if ($cache_status == 'HIT') {
+            $rss = $cache->get($cache_key);
+            if (isset($rss) and $rss) {
                 // should be cache age
                 $rss->from_cache = 1;
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
                 }
                 return $rss;
@@ -155,50 +155,50 @@ 
         // else attempt a conditional get
 
         // setup headers
-        if ( $cache_status == 'STALE' ) {
-            $rss = $cache->get( $cache_key );
-            if ( $rss and $rss->etag and $rss->last_modified ) {
+        if ($cache_status == 'STALE') {
+            $rss = $cache->get($cache_key);
+            if ($rss and $rss->etag and $rss->last_modified) {
                 $request_headers['If-None-Match'] = $rss->etag;
                 $request_headers['If-Last-Modified'] = $rss->last_modified;
             }
         }
 
-        $resp = _fetch_remote_file( $url, $request_headers );
+        $resp = _fetch_remote_file($url, $request_headers);
 
         if (isset($resp) and $resp) {
-          if ($resp->status == '304' ) {
+          if ($resp->status == '304') {
                 // we have the most current copy
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("Got 304 for $url");
                 }
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
             }
-            elseif ( is_success( $resp->status ) ) {
-                $rss = _response_to_rss( $resp );
-                if ( $rss ) {
+            elseif (is_success($resp->status)) {
+                $rss = _response_to_rss($resp);
+                if ($rss) {
                     if (MAGPIE_DEBUG > 1) {
                         debug("Fetch successful");
                     }
                     // add object to cache
-                    $cache->set( $cache_key, $rss );
+                    $cache->set($cache_key, $rss);
                     return $rss;
                 }
             }
             else {
                 $errormsg = "Failed to fetch $url ";
-                if ( $resp->status == '-100' ) {
-                    $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
+                if ($resp->status == '-100') {
+                    $errormsg .= "(Request timed out after ".MAGPIE_FETCH_TIME_OUT." seconds)";
                 }
-                elseif ( $resp->error ) {
+                elseif ($resp->error) {
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'
                     $http_error = substr($resp->error, 0, -2);
                     $errormsg .= "(HTTP Error: $http_error)";
                 }
                 else {
-                    $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
+                    $errormsg .= "(HTTP Response: ".$resp->response_code.')';
                 }
             }
         }
@@ -210,14 +210,14 @@ 
 
         // attempt to return cached object
         if ($rss) {
-            if ( MAGPIE_DEBUG ) {
+            if (MAGPIE_DEBUG) {
                 debug("Returning STALE object for $url");
             }
             return $rss;
         }
 
         // else we totally failed
-        error( $errormsg );
+        error($errormsg);
 
         return false;
 
@@ -229,21 +229,21 @@ 
     Purpose:    set MAGPIE_ERROR, and trigger error
 \*=======================================================================*/
 
-function error ($errormsg, $lvl=E_USER_WARNING) {
+function error($errormsg, $lvl = E_USER_WARNING){
         global $MAGPIE_ERROR;
 
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) {
+        if (isset($php_errormsg)) {
             $errormsg .= " ($php_errormsg)";
         }
-        if ( $errormsg ) {
+        if ($errormsg) {
             $errormsg = "MagpieRSS: $errormsg";
             $MAGPIE_ERROR = $errormsg;
-            trigger_error( $errormsg, $lvl);
+            trigger_error($errormsg, $lvl);
         }
 }
 
-function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+function debug($debugmsg, $lvl = E_USER_NOTICE){
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
 
@@ -251,10 +251,10 @@ 
     Function:   magpie_error
     Purpose:    accessor for the magpie error variable
 \*=======================================================================*/
-function magpie_error ($errormsg="") {
+function magpie_error($errormsg = ""){
     global $MAGPIE_ERROR;
 
-    if ( isset($errormsg) and $errormsg ) {
+    if (isset($errormsg) and $errormsg) {
         $MAGPIE_ERROR = $errormsg;
     }
 
@@ -268,13 +268,13 @@ 
                 headers to send along with the request (optional)
     Output:     an HTTP response object (see Snoopy.class.inc)
 \*=======================================================================*/
-function _fetch_remote_file ($url, $headers = "" ) {
+function _fetch_remote_file($url, $headers = ""){
     // Snoopy is an HTTP client in PHP
     $client = new Snoopy();
     $client->agent = MAGPIE_USER_AGENT;
     $client->read_timeout = MAGPIE_FETCH_TIME_OUT;
     $client->use_gzip = MAGPIE_USE_GZIP;
-    if (is_array($headers) ) {
+    if (is_array($headers)) {
         $client->rawheaders = $headers;
     }
 
@@ -289,14 +289,14 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
-function _response_to_rss ($resp) {
-    $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
+function _response_to_rss($resp){
+    $rss = new MagpieRSS($resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING);
 
     // if RSS parsed successfully
-    if ( $rss and !$rss->ERROR) {
+    if ($rss and !$rss->ERROR) {
 
         // find Etag, and Last-Modified
-        foreach($resp->headers as $h) {
+        foreach ($resp->headers as $h) {
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
@@ -306,11 +306,11 @@ 
                 $val = "";
             }
 
-            if ( $field == 'ETag' ) {
+            if ($field == 'ETag') {
                 $rss->etag = $val;
             }
 
-            if ( $field == 'Last-Modified' ) {
+            if ($field == 'Last-Modified') {
                 $rss->last_modified = $val;
             }
         }
@@ -321,7 +321,7 @@ 
         $errormsg = "Failed to parse RSS file.";
 
         if ($rss) {
-            $errormsg .= " (" . $rss->ERROR . ")";
+            $errormsg .= " (".$rss->ERROR.")";
         }
         error($errormsg);
 
@@ -334,67 +334,67 @@ 
     Purpose:    setup constants with default values
                 check for user overrides
 \*=======================================================================*/
-function init () {
-    if ( defined('MAGPIE_INITALIZED') ) {
+function init(){
+    if (defined('MAGPIE_INITALIZED')) {
         return;
     }
     else {
         define('MAGPIE_INITALIZED', true);
     }
 
-    if ( !defined('MAGPIE_CACHE_ON') ) {
+    if (!defined('MAGPIE_CACHE_ON')) {
         define('MAGPIE_CACHE_ON', true);
     }
 
-    if ( !defined('MAGPIE_CACHE_DIR') ) {
+    if (!defined('MAGPIE_CACHE_DIR')) {
         define('MAGPIE_CACHE_DIR', './cache');
     }
 
-    if ( !defined('MAGPIE_CACHE_AGE') ) {
-        define('MAGPIE_CACHE_AGE', 60*60); // one hour
+    if (!defined('MAGPIE_CACHE_AGE')) {
+        define('MAGPIE_CACHE_AGE', 60 * 60); // one hour
     }
 
-    if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
+    if (!defined('MAGPIE_CACHE_FRESH_ONLY')) {
         define('MAGPIE_CACHE_FRESH_ONLY', false);
     }
 
-    if ( !defined('MAGPIE_OUTPUT_ENCODING') ) {
+    if (!defined('MAGPIE_OUTPUT_ENCODING')) {
         global $modx_manager_charset;
-        if(empty($modx_manager_charset)) $modx_manager_charset = 'ISO-8859-1';
+        if (empty($modx_manager_charset)) $modx_manager_charset = 'ISO-8859-1';
         define('MAGPIE_OUTPUT_ENCODING', $modx_manager_charset);
     }
 
-    if ( !defined('MAGPIE_INPUT_ENCODING') ) {
+    if (!defined('MAGPIE_INPUT_ENCODING')) {
         define('MAGPIE_INPUT_ENCODING', null);
     }
 
-    if ( !defined('MAGPIE_DETECT_ENCODING') ) {
+    if (!defined('MAGPIE_DETECT_ENCODING')) {
         define('MAGPIE_DETECT_ENCODING', true);
     }
 
-    if ( !defined('MAGPIE_DEBUG') ) {
+    if (!defined('MAGPIE_DEBUG')) {
         define('MAGPIE_DEBUG', 0);
     }
 
-    if ( !defined('MAGPIE_USER_AGENT') ) {
-        $ua = 'MagpieRSS/'. MAGPIE_VERSION . ' (+http://magpierss.sf.net';
+    if (!defined('MAGPIE_USER_AGENT')) {
+        $ua = 'MagpieRSS/'.MAGPIE_VERSION.' (+http://magpierss.sf.net';
 
-        if ( MAGPIE_CACHE_ON ) {
-            $ua = $ua . ')';
+        if (MAGPIE_CACHE_ON) {
+            $ua = $ua.')';
         }
         else {
-            $ua = $ua . '; No cache)';
+            $ua = $ua.'; No cache)';
         }
 
         define('MAGPIE_USER_AGENT', $ua);
     }
 
-    if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
+    if (!defined('MAGPIE_FETCH_TIME_OUT')) {
         define('MAGPIE_FETCH_TIME_OUT', 5); // 5 second timeout
     }
 
     // use gzip encoding to fetch rss files if supported?
-    if ( !defined('MAGPIE_USE_GZIP') ) {
+    if (!defined('MAGPIE_USE_GZIP')) {
         define('MAGPIE_USE_GZIP', true);
     }
 }
@@ -417,7 +417,7 @@ 
     Function:   is_info
     Purpose:    return true if Informational status code
 \*=======================================================================*/
-function is_info ($sc) {
+function is_info($sc){
     return $sc >= 100 && $sc < 200;
 }
 
@@ -425,7 +425,7 @@ 
     Function:   is_success
     Purpose:    return true if Successful status code
 \*=======================================================================*/
-function is_success ($sc) {
+function is_success($sc){
     return $sc >= 200 && $sc < 300;
 }
 
@@ -433,7 +433,7 @@ 
     Function:   is_redirect
     Purpose:    return true if Redirection status code
 \*=======================================================================*/
-function is_redirect ($sc) {
+function is_redirect($sc){
     return $sc >= 300 && $sc < 400;
 }
 
@@ -441,7 +441,7 @@ 
     Function:   is_error
     Purpose:    return true if Error status code
 \*=======================================================================*/
-function is_error ($sc) {
+function is_error($sc){
     return $sc >= 400 && $sc < 600;
 }
 
@@ -449,7 +449,7 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a client error
 \*=======================================================================*/
-function is_client_error ($sc) {
+function is_client_error($sc){
     return $sc >= 400 && $sc < 500;
 }
 
@@ -457,6 +457,6 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a server error
 \*=======================================================================*/
-function is_server_error ($sc) {
+function is_server_error($sc){
     return $sc >= 500 && $sc < 600;
 }

manager/media/browser/mcpuk/js_localize.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
     header("Content-Type: text/javascript");
     die;
 }
-$file = "lang/" . $input->get['lng'] . ".php";
+$file = "lang/".$input->get['lng'].".php";
 $files = dir::content("lang", array(
     'types' => "file",
     'pattern' => '/^.*\.php$/'
@@ -33,4 +33,4 @@ 
 header("Content-Type: text/javascript; charset={$lang['_charset']}");
 foreach ($lang as $english => $native)
     if (substr($english, 0, 1) != "_")
-        echo "browser.labels['" . text::jsValue($english) . "']=\"" . text::jsValue($native) . "\";";
+        echo "browser.labels['".text::jsValue($english)."']=\"".text::jsValue($native)."\";";

manager/media/browser/mcpuk/lib/class_gd.php

Spacing +39 added lines, -39 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com

   */

 

-class gd {

+class gd{

 

   /** GD resource

     * @var resource */

@@ -40,7 +40,7 @@ 
     * @param mixed $image

     * @return array */

 

-    protected function build_image($image) {

+    protected function build_image($image){

 

         if ($image instanceof gd) {

             $width = $image->get_width();

@@ -58,12 +58,12 @@ 
 

         } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) {

             $image =

-                ($type == IMAGETYPE_GIF)      ? @imagecreatefromgif($image)  : (

-                ($type == IMAGETYPE_WBMP)     ? @imagecreatefromwbmp($image) : (

-                ($type == IMAGETYPE_JPEG)     ? @imagecreatefromjpeg($image) : (

+                ($type == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : (

+                ($type == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : (

+                ($type == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : (

                 ($type == IMAGETYPE_JPEG2000) ? @imagecreatefromjpeg($image) : (

-                ($type == IMAGETYPE_PNG)      ? @imagecreatefrompng($image)  : (

-                ($type == IMAGETYPE_XBM)      ? @imagecreatefromxbm($image)  : false

+                ($type == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : (

+                ($type == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false

             )))));

 

             if ($type == IMAGETYPE_PNG)

@@ -98,7 +98,7 @@ 
     * @param integer $bigger_size

     * @return gd */

 

-    public function __construct($image, $bigger_size=null) {

+    public function __construct($image, $bigger_size = null){

         $this->image = $this->width = $this->height = null;

 

         $image_details = $this->build_image($image);

@@ -126,21 +126,21 @@ 
   /** Returns the GD resource

     * @return resource */

 

-    public function get_image() {

+    public function get_image(){

         return $this->image;

     }

 

   /** Returns the image width

     * @return integer */

 

-    public function get_width() {

+    public function get_width(){

         return $this->width;

     }

 

   /** Returns the image height

     * @return integer */

 

-    public function get_height() {

+    public function get_height(){

         return $this->height;

     }

 

@@ -148,7 +148,7 @@ 
     * @param integer $resized_height

     * @return integer */

 

-    public function get_prop_width($resized_height) {

+    public function get_prop_width($resized_height){

         $width = intval(($this->width * $resized_height) / $this->height);

         if (!$width) $width = 1;

         return $width;

@@ -158,7 +158,7 @@ 
     * @param integer $resized_width

     * @return integer */

 

-    public function get_prop_height($resized_width) {

+    public function get_prop_height($resized_width){

         $height = intval(($this->height * $resized_width) / $this->width);

         if (!$height) $height = 1;

         return $height;

@@ -170,7 +170,7 @@ 
     * @param integer $bigger_size

     * @return array */

 

-    public function get_prop_size($bigger_size) {

+    public function get_prop_size($bigger_size){

 

         if ($this->width > $this->height) {

             $width = $bigger_size;

@@ -191,7 +191,7 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize($width, $height) {

+    public function resize($width, $height){

         if (!$width) $width = 1;

         if (!$height) $height = 1;

         return (

@@ -208,7 +208,7 @@ 
     * @param mixed $src

     * @return bool */

 

-    public function resize_crop($src) {

+    public function resize_crop($src){

         $image_details = $this->build_image($src);

 

         if ($image_details !== false) {

@@ -238,7 +238,7 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize_fit($width, $height) {

+    public function resize_fit($width, $height){

         if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))

             return true;

         if (!$width || (($height / $width) < ($this->height / $this->width)))

@@ -257,7 +257,7 @@ 
     * @param integer $height

     * @return bool */

 

-    public function resize_overflow($width, $height) {

+    public function resize_overflow($width, $height){

 

         $big = (($this->width / $this->height) > ($width / $height))

             ? ($this->width * $height) / $this->height

@@ -275,7 +275,7 @@ 
         return $return;

     }

 

-    public function gd_color() {

+    public function gd_color(){

         $args = func_get_args();

 

         $expr_rgb = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i';

@@ -317,7 +317,7 @@ 
         return imagecolorallocate($this->image, $r, $g, $b);

     }

 

-    public function fill_color($color) {

+    public function fill_color($color){

         return $this->imagefilledrectangle(0, 0, $this->width - 1, $this->height - 1, $color);

     }

 

@@ -326,11 +326,11 @@ 
 

     public function imagecopy(

         $src,

-        $dst_x=0, $dst_y=0,

-        $src_x=0, $src_y=0,

-        $dst_w=null, $dst_h=null,

-        $src_w=null, $src_h=null

-    ) {

+        $dst_x = 0, $dst_y = 0,

+        $src_x = 0, $src_y = 0,

+        $dst_w = null, $dst_h = null,

+        $src_w = null, $src_h = null

+    ){

         $image_details = $this->build_image($src);

 

         if ($image_details !== false) {

@@ -348,11 +348,11 @@ 
 

     public function imagecopyresampled(

         $src,

-        $dst_x=0, $dst_y=0,

-        $src_x=0, $src_y=0,

-        $dst_w=null, $dst_h=null,

-        $src_w=null, $src_h=null

-    ) {

+        $dst_x = 0, $dst_y = 0,

+        $src_x = 0, $src_y = 0,

+        $dst_w = null, $dst_h = null,

+        $src_w = null, $src_h = null

+    ){

         $image_details = $this->build_image($src);

 

         if ($image_details !== false) {

@@ -363,7 +363,7 @@ 
             if (is_null($src_w)) $src_w = $src_width - $src_x;

             if (is_null($src_h)) $src_h = $src_height - $src_y;

             imagealphablending($this->image, false);

-            imagesavealpha($this->image,true);

+            imagesavealpha($this->image, true);

 

 

 

@@ -372,7 +372,7 @@ 
 

 			$transindex = imagecolortransparent($src);

 			$palletsize = imagecolorstotal($src);

-			if($transindex >= 0 && $transindex < $palletsize) {

+			if ($transindex >= 0 && $transindex < $palletsize) {

 				$transcol = imagecolorsforindex($src, $transindex);

 

 			/*** end gif transparent fix ***/

@@ -381,9 +381,9 @@ 
 				imagefilledrectangle($this->image, 0, 0, $dst_w, $dst_h, $transindex);

 				imagecopyresampled($this->image, $src, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);

 				imagecolortransparent($this->image, $transindex);

-				for($y=0; $y<$dst_h; ++$y)

-					for($x=0; $x<$dst_w; ++$x)

-						if(((imagecolorat($this->image, $x, $y)>>24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);

+				for ($y = 0; $y < $dst_h; ++$y)

+					for ($x = 0; $x < $dst_w; ++$x)

+						if (((imagecolorat($this->image, $x, $y) >> 24) & 0x7F) >= 100) imagesetpixel($this->image, $x, $y, $transindex);

 				imagetruecolortopalette($this->image, true, 255);

 			}

 			else {

@@ -397,26 +397,26 @@ 
             return false;

     }

 

-    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color) {

+    public function imagefilledrectangle($x1, $y1, $x2, $y2, $color){

         $color = $this->gd_color($color);

         if ($color === false) return false;

         return imagefilledrectangle($this->image, $x1, $y1, $x2, $y2, $color);

     }

 

-    public function imagepng($filename=null, $quality=null, $filters=null) {

+    public function imagepng($filename = null, $quality = null, $filters = null){

         if (is_null($filename) && !headers_sent())

             header("Content-Type: image/png");

         @imagesavealpha($this->image, true);

         return imagepng($this->image, $filename, $quality, $filters);

     }

 

-    public function imagejpeg($filename=null, $quality=75) {

+    public function imagejpeg($filename = null, $quality = 75){

         if (is_null($filename) && !headers_sent())

             header("Content-Type: image/jpeg");

         return imagejpeg($this->image, $filename, $quality);

     }

 

-    public function imagegif($filename=null) {

+    public function imagegif($filename = null){

         if (is_null($filename) && !headers_sent())

             header("Content-Type: image/gif");

 			@imagesavealpha($this->image, true);

install/lang.php

Spacing +9 added lines, -9 removed lines

@@ -10,12 +10,12 @@ 
  * Filename:       /install/lang.php
  */
 
-$_lang = array ();
+$_lang = array();
 
 #default fallback language file - english
 $install_language = "english";
 
-$_langFiles= array (
+$_langFiles = array(
  "en" => "english",
  "bg" => "bulgarian",
  "cs" => "czech",
@@ -36,14 +36,14 @@ 
  "es" => "spanish-utf8",
  "sv" => "svenska"
 );
-$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2);
+$_langISO6391 = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
 if (!empty($_langFiles[$_langISO6391]))  $install_language = $_langFiles[$_langISO6391];
 
 
-if (isset($_POST['language']) && !stristr($_POST['language'],"..")) {
+if (isset($_POST['language']) && !stristr($_POST['language'], "..")) {
 	$install_language = $_POST['language'];
 } else {
-	if (isset($_GET['language']) && !stristr($_GET['language'],".."))
+	if (isset($_GET['language']) && !stristr($_GET['language'], ".."))
 		$install_language = $_GET['language'];
 }
 # load language file
@@ -52,15 +52,15 @@ 
 
 $manager_language = $install_language;
 
-if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'],"..")) {
+if (isset($_POST['managerlanguage']) && !stristr($_POST['managerlanguage'], "..")) {
 	$manager_language = $_POST['managerlanguage'];
 } else {
-	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'],".."))
+	if (isset($_GET['managerlanguage']) && !stristr($_GET['managerlanguage'], ".."))
 		$manager_language = $_GET['managerlanguage'];
 }
 
-foreach($_lang as $k=>$v)
+foreach ($_lang as $k=>$v)
 {
-	if(strpos($v,'[+MGR_DIR+]')!==false)
+	if (strpos($v, '[+MGR_DIR+]') !== false)
 		$_lang[$k] = str_replace('[+MGR_DIR+]', MGR_DIR, $v);
 }

install/actions/action_language.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if( ! function_exists('getLangOptions')) {
+if (!function_exists('getLangOptions')) {
     /**
      * @param string $install_language
      * @return string
@@ -21,7 +21,7 @@ 
             $abrv_language = explode('-', $language);
             $selected = ($language === $install_language) ? 'selected' : '';
             $_[] = sprintf('<option value="%s" %s>%s</option>', $language, $selected,
-                    ucwords($abrv_language[0])) . "\n";
+                    ucwords($abrv_language[0]))."\n";
         }
 
         return implode("\n", $_);
@@ -32,6 +32,6 @@ 
 $content = parse($content, array(
     'langOptions' => getLangOptions($install_language))
 );
-$content = parse($content, $_lang,'[%','%]');
+$content = parse($content, $_lang, '[%', '%]');
 
 echo $content;

manager/media/browser/mcpuk/lib/class_image_imagick.php

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_imagick extends image {
+class image_imagick extends image{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,7 +21,7 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
+    public function resize($width, $height){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         try {
@@ -34,7 +34,7 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
+    public function resizeFit($width, $height, $background = false){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -65,7 +65,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -115,7 +115,7 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background = "#000000"){
         try {
             $this->image->rotateImage(new ImagickPixel($background), $angle);
             $size = $this->image->getImageGeometry();
@@ -127,7 +127,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -136,7 +136,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -145,7 +145,7 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left = false, $top = false){
         try {
             $wm = new Imagick($file);
             $size = $wm->getImageGeometry();
@@ -181,7 +181,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         try {
             $img = new Imagick();
             $img->newImage($width, $height, "none");
@@ -192,7 +192,7 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height){
 
         if (is_object($image) && ($image instanceof image_imagick)) {
             try {
@@ -234,11 +234,11 @@ 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available(){
         return class_exists("Imagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file){
         try {
             new Imagick($file);
         } catch (Exception $e) {
@@ -250,7 +250,7 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type = "jpeg", array $options = array()){
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -269,7 +269,7 @@ 
             echo $this->image;
 
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -289,7 +289,7 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options = array()){
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setImageCompression(Imagick::COMPRESSION_JPEG);

manager/media/browser/mcpuk/lib/class_image_gmagick.php

Spacing +15 added lines, -15 removed lines

@@ -12,7 +12,7 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gmagick extends image {
+class image_gmagick extends image{
 
     static $MIMES = array(
         //'tif' => "image/tiff"
@@ -21,7 +21,7 @@ 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {//
+    public function resize($width, $height){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         try {
@@ -34,7 +34,7 @@ 
         return true;
     }
 
-    public function resizeFit($width, $height, $background=false) {//
+    public function resizeFit($width, $height, $background = false){//
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -69,7 +69,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
 
@@ -119,7 +119,7 @@ 
         return true;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background = "#000000"){
         try {
             $this->image->rotateImage($background, $angle);
             $w = $this->image->getImageWidth();
@@ -132,7 +132,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         try {
             $this->image->flopImage();
         } catch (Exception $e) {
@@ -141,7 +141,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         try {
             $this->image->flipImage();
         } catch (Exception $e) {
@@ -150,7 +150,7 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left = false, $top = false){
         try {
             $wm = new Gmagick($file);
             $w = $wm->getImageWidth();
@@ -185,7 +185,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         try {
             $img = new Gmagick();
             $img->newImage($width, $height, "none");
@@ -195,7 +195,7 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height){
 
         if (is_object($image) && ($image instanceof image_gmagick)) {
             $width = $image->width;
@@ -232,11 +232,11 @@ 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available(){
         return class_exists("Gmagick");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file){
         try {
             new Gmagick($file);
         } catch (Exception $e) {
@@ -248,7 +248,7 @@ 
 
     // INHERIT METHODS
 
-    public function output($type="jpeg", array $options=array()) {
+    public function output($type = "jpeg", array $options = array()){
         $type = strtolower($type);
         try {
             $this->image->setImageFormat($type);
@@ -267,7 +267,7 @@ 
             echo $this->image;
 
         } else {
-            $file = $options['file'] . ".$type";
+            $file = $options['file'].".$type";
             try {
                 $this->image->writeImage($file);
             } catch (Exception $e) {
@@ -287,7 +287,7 @@ 
 
     // OWN METHODS
 
-    protected function optimize_jpeg(array $options=array()) {
+    protected function optimize_jpeg(array $options = array()){
         $quality = isset($options['quality']) ? $options['quality'] : self::DEFAULT_JPEG_QUALITY;
         try {
             $this->image->setCompressionQuality($quality);