evolution-cms / evolution

manager/actions/import_site.static.php

Doc Comments +1 added lines, -1 removed lines

@@ -346,7 +346,7 @@
 
 /**
  * @param string $filepath
- * @return bool|string
+ * @return null|string
  */
 function getFileContent($filepath)
 {

Spacing +32 added lines, -32 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('import_static')) {
@@ -44,7 +44,7 @@ 
 		<div class="container container-body">
 			<?php
             if (!isset($_POST['import'])) {
-                echo "<div class=\"element-edit-message\">" . $_lang['import_site_message'] . "</div>"; ?>
+                echo "<div class=\"element-edit-message\">".$_lang['import_site_message']."</div>"; ?>
 				<form action="index.php" method="post" name="importFrm">
 					<input type="hidden" name="import" value="import" />
 					<input type="hidden" name="a" value="95" />
@@ -127,12 +127,12 @@ 
         $modx->db->query("ALTER TABLE {$tbl_site_content} AUTO_INCREMENT = 1");
     }
 
-    $parent = (int)$_POST['parent'];
+    $parent = (int) $_POST['parent'];
 
-    if (is_dir(MODX_BASE_PATH . 'temp/import')) {
-        $filedir = MODX_BASE_PATH . 'temp/import/';
-    } elseif (is_dir(MODX_BASE_PATH . 'assets/import')) {
-        $filedir = MODX_BASE_PATH . 'assets/import/';
+    if (is_dir(MODX_BASE_PATH.'temp/import')) {
+        $filedir = MODX_BASE_PATH.'temp/import/';
+    } elseif (is_dir(MODX_BASE_PATH.'assets/import')) {
+        $filedir = MODX_BASE_PATH.'assets/import/';
     } else {
         $filedir = '';
     }
@@ -143,7 +143,7 @@ 
     $files = pop_index($files);
 
     // no. of files to import
-    $output .= sprintf('<p>' . $_lang['import_files_found'] . '</p>', $filesfound);
+    $output .= sprintf('<p>'.$_lang['import_files_found'].'</p>', $filesfound);
 
     // import files
     if (0 < count($files)) {
@@ -156,7 +156,7 @@ 
     $mtime = $mtime[1] + $mtime[0];
     $importend = $mtime;
     $totaltime = ($importend - $importstart);
-    $output .= sprintf('<p>' . $_lang['import_site_time'] . '</p>', round($totaltime, 3));
+    $output .= sprintf('<p>'.$_lang['import_site_time'].'</p>', round($totaltime, 3));
 
     if ($_POST['convert_link'] == 'on') {
         convertLink();
@@ -195,7 +195,7 @@ 
         if (is_array($value)) {
             // create folder
             $alias = $id;
-            printf('<span>' . $_lang['import_site_importing_document'] . '</span>', $alias);
+            printf('<span>'.$_lang['import_site_importing_document'].'</span>', $alias);
             $field = array();
             $field['type'] = 'document';
             $field['contentType'] = 'text/html';
@@ -214,7 +214,7 @@ 
                         'index.html',
                         'index.htm'
                     ) as $filename) {
-                $filepath = $filedir . $alias . '/' . $filename;
+                $filepath = $filedir.$alias.'/'.$filename;
                 if ($find === false && file_exists($filepath)) {
                     $file = getFileContent($filepath);
                     list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
@@ -229,10 +229,10 @@ 
                     $newid = $modx->db->insert($field, $tbl_site_content);
                     if ($newid) {
                         $find = true;
-                        echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-                        importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+                        echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
+                        importFiles($newid, $filedir.$alias.'/', $value, 'sub');
                     } else {
-                        echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+                        echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError();
                         exit;
                     }
                 }
@@ -247,10 +247,10 @@ 
                 $newid = $modx->db->insert($field, $tbl_site_content);
                 if ($newid) {
                     $find = true;
-                    echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
-                    importFiles($newid, $filedir . $alias . '/', $value, 'sub');
+                    echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
+                    importFiles($newid, $filedir.$alias.'/', $value, 'sub');
                 } else {
-                    echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+                    echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError();
                     exit;
                 }
             }
@@ -263,12 +263,12 @@ 
             $fparts = explode('.', $value);
             $alias = $fparts[0];
             $ext = (count($fparts) > 1) ? $fparts[count($fparts) - 1] : "";
-            printf("<span>" . $_lang['import_site_importing_document'] . "</span>", $filename);
+            printf("<span>".$_lang['import_site_importing_document']."</span>", $filename);
 
             if (!in_array($ext, $allowedfiles)) {
-                echo ' - <span class="fail">' . $_lang["import_site_skip"] . '</span><br />' . "\n";
+                echo ' - <span class="fail">'.$_lang["import_site_skip"].'</span><br />'."\n";
             } else {
-                $filepath = $filedir . $filename;
+                $filepath = $filedir.$filename;
                 $file = getFileContent($filepath);
                 list($pagetitle, $content, $description) = treatContent($file, $filename, $alias);
 
@@ -294,9 +294,9 @@ 
                 $field['menuindex'] = ($alias == 'index') ? 0 : 2;
                 $newid = $modx->db->insert($field, $tbl_site_content);
                 if ($newid) {
-                    echo ' - <span class="success">' . $_lang['import_site_success'] . '</span><br />' . "\n";
+                    echo ' - <span class="success">'.$_lang['import_site_success'].'</span><br />'."\n";
                 } else {
-                    echo '<span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_db_error"] . $modx->db->getLastError();
+                    echo '<span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_db_error"].$modx->db->getLastError();
                     exit;
                 }
 
@@ -324,14 +324,14 @@ 
     global $_lang;
     global $filesfound;
     $dummy = $count;
-    if (! empty($directory) && $files = scandir($directory)) {
+    if (!empty($directory) && $files = scandir($directory)) {
         foreach ($files as $file) {
             if ($file == '.' || $file == '..') {
                 continue;
-            } elseif ($h = @opendir($directory . $file . "/")) {
+            } elseif ($h = @opendir($directory.$file."/")) {
                 closedir($h);
                 $count = -1;
-                $listing[$file] = getFiles($directory . $file . "/", array(), $count + 1);
+                $listing[$file] = getFiles($directory.$file."/", array(), $count + 1);
             } elseif (strpos($file, '.htm') !== false) {
                 $listing[$dummy] = $file;
                 $dummy = $dummy + 1;
@@ -339,7 +339,7 @@ 
             }
         }
     } else {
-        echo '<p><span class="fail">' . $_lang["import_site_failed"] . "</span> " . $_lang["import_site_failed_no_open_dir"] . $directory . ".</p>";
+        echo '<p><span class="fail">'.$_lang["import_site_failed"]."</span> ".$_lang["import_site_failed_no_open_dir"].$directory.".</p>";
     }
     return ($listing);
 }
@@ -353,7 +353,7 @@ 
     global $_lang;
     // get the file
     if (!$buffer = file_get_contents($filepath)) {
-        echo '<p><span class="fail">' . $_lang['import_site_failed'] . "</span> " . $_lang["import_site_failed_no_retrieve_file"] . $filepath . ".</p>";
+        echo '<p><span class="fail">'.$_lang['import_site_failed']."</span> ".$_lang["import_site_failed_no_retrieve_file"].$filepath.".</p>";
     } else {
         return $buffer;
     }
@@ -415,7 +415,7 @@ 
     } else {
         $content = $src;
         $s = '/(<meta[^>]+charset\s*=)[^>"\'=]+(.+>)/i';
-        $r = '$1' . $modx->config['modx_charset'] . '$2';
+        $r = '$1'.$modx->config['modx_charset'].'$2';
         $content = preg_replace($s, $r, $content);
         $content = preg_replace('@<title>.*</title>@i', "<title>[*pagetitle*]</title>", $content);
     }
@@ -451,7 +451,7 @@ 
                 list($href, $v) = explode('"', $v, 2);
                 $_ = $href;
                 if (strpos($_, $modx->config['site_url']) !== false) {
-                    $_ = $modx->config['base_url'] . str_replace($modx->config['site_url'], '', $_);
+                    $_ = $modx->config['base_url'].str_replace($modx->config['site_url'], '', $_);
                 }
                 if ($_[0] === '/') {
                     $_ = substr($_, 1);
@@ -478,15 +478,15 @@ 
                 if (strpos($_, '/') !== false) {
                     $_ = substr($_, strrpos($_, '/'));
                 }
-                $_ = $dir . str_replace('.html', '', $_);
+                $_ = $dir.str_replace('.html', '', $_);
                 if (!isset($target[$_])) {
                     $target[$_] = $modx->getIdFromAlias($_);
                 }
                 $target[$_] = trim($target[$_]);
                 if (!empty($target[$_])) {
-                    $href = '[~' . $target[$_] . '~]';
+                    $href = '[~'.$target[$_].'~]';
                 }
-                $array[$c] = '<a href="' . $href . '"' . $v;
+                $array[$c] = '<a href="'.$href.'"'.$v;
             }
             $c++;
         }

manager/includes/controls/datagrid.class.php

Doc Comments +7 added lines

@@ -72,6 +72,10 @@ 
      */
     public $cdelim;
 
+    /**
+     * @param null|string $id
+     * @param string $ds
+     */
     public function __construct($id, $ds, $pageSize = 20, $pageNumber = -1)
     {
         global $__DataGridCnt;
@@ -212,6 +216,9 @@ 
 
     // format column values
 
+    /**
+     * @param integer $n
+     */
     public function RenderRowFnc($n, $row)
     {
         if ($this->_alt == 0) {

Spacing +28 added lines, -28 removed lines

@@ -14,10 +14,10 @@ 
 {
     public $ds; // datasource
     public $id;
-    public $pageSize;            // pager settings
+    public $pageSize; // pager settings
     public $pageNumber;
     public $pager;
-    public $pagerLocation;        // top-right, top-left, bottom-left, bottom-right, both-left, both-right
+    public $pagerLocation; // top-right, top-left, bottom-left, bottom-right, both-left, both-right
 
     public $cssStyle;
     public $cssClass;
@@ -35,7 +35,7 @@ 
     public $colAligns;
     public $colWraps;
     public $colColors;
-    public $colTypes;            // coltype1, coltype2, etc or coltype1:format1, e.g. date:%Y %m
+    public $colTypes; // coltype1, coltype2, etc or coltype1:format1, e.g. date:%Y %m
     // data type: integer,float,currency,date
 
     public $header;
@@ -43,7 +43,7 @@ 
     public $cellPadding;
     public $cellSpacing;
 
-    public $rowAlign;            // vertical alignment: top, middle, bottom
+    public $rowAlign; // vertical alignment: top, middle, bottom
     public $rowIdField;
 
     public $pagerStyle;
@@ -78,7 +78,7 @@ 
 
         // set id
         $__DataGridCnt++;
-        $this->id = $this->id ? empty($id) : "dg" . $__DataGridCnt;
+        $this->id = $this->id ? empty($id) : "dg".$__DataGridCnt;
 
         // set datasource
         $this->ds = $ds;
@@ -97,18 +97,18 @@ 
     public function render()
     {
         $modx = evolutionCMS();
-        $columnHeaderStyle = ($this->columnHeaderStyle) ? "style='" . $this->columnHeaderStyle . "'" : '';
-        $columnHeaderClass = ($this->columnHeaderClass) ? "class='" . $this->columnHeaderClass . "'" : "";
-        $cssStyle = ($this->cssStyle) ? "style='" . $this->cssStyle . "'" : '';
-        $cssClass = ($this->cssClass) ? "class='" . $this->cssClass . "'" : '';
+        $columnHeaderStyle = ($this->columnHeaderStyle) ? "style='".$this->columnHeaderStyle."'" : '';
+        $columnHeaderClass = ($this->columnHeaderClass) ? "class='".$this->columnHeaderClass."'" : "";
+        $cssStyle = ($this->cssStyle) ? "style='".$this->cssStyle."'" : '';
+        $cssClass = ($this->cssClass) ? "class='".$this->cssClass."'" : '';
 
-        $pagerClass = ($this->pagerClass) ? "class='" . $this->pagerClass . "'" : '';
-        $pagerStyle = ($this->pagerStyle) ? "style='" . $this->pagerStyle . "'" : "style='background-color:#ffffff;'";
+        $pagerClass = ($this->pagerClass) ? "class='".$this->pagerClass."'" : '';
+        $pagerStyle = ($this->pagerStyle) ? "style='".$this->pagerStyle."'" : "style='background-color:#ffffff;'";
 
-        $this->_itemStyle = ($this->itemStyle) ? "style='" . $this->itemStyle . "'" : '';
-        $this->_itemClass = ($this->itemClass) ? "class='" . $this->itemClass . "'" : '';
-        $this->_altItemStyle = ($this->altItemStyle) ? "style='" . $this->altItemStyle . "'" : '';
-        $this->_altItemClass = ($this->altItemClass) ? "class='" . $this->altItemClass . "'" : '';
+        $this->_itemStyle = ($this->itemStyle) ? "style='".$this->itemStyle."'" : '';
+        $this->_itemClass = ($this->itemClass) ? "class='".$this->itemClass."'" : '';
+        $this->_altItemStyle = ($this->altItemStyle) ? "style='".$this->altItemStyle."'" : '';
+        $this->_altItemClass = ($this->altItemClass) ? "class='".$this->altItemClass."'" : '';
 
         $this->_alt = 0;
         $this->_total = 0;
@@ -131,12 +131,12 @@ 
         if ($this->_isDataset && !$this->columns) {
             $cols = $modx->db->numFields($this->ds);
             for ($i = 0; $i < $cols; $i++) {
-                $this->columns .= ($i ? "," : "") . $modx->db->fieldName($this->ds, $i);
+                $this->columns .= ($i ? "," : "").$modx->db->fieldName($this->ds, $i);
             }
         }
 
         // start grid
-        $tblStart = "<table $cssClass $cssStyle cellpadding='" . (isset($this->cellPadding) ? (int) $this->cellPadding : 1) . "' cellspacing='" . (isset($this->cellSpacing) ? (int) $this->cellSpacing : 1) . "'>";
+        $tblStart = "<table $cssClass $cssStyle cellpadding='".(isset($this->cellPadding) ? (int) $this->cellPadding : 1)."' cellspacing='".(isset($this->cellSpacing) ? (int) $this->cellSpacing : 1)."'>";
         $tblEnd = "</table>";
 
         // build column header
@@ -155,7 +155,7 @@ 
         for ($c = 0; $c < $this->_colcount; $c++) {
             $name = $this->_colnames[$c];
             $width = $this->_colwidths[$c];
-            $tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass" . ($width ? " width='$width'" : "") . ">$name</td>";
+            $tblColHdr .= "<td $columnHeaderStyle $columnHeaderClass".($width ? " width='$width'" : "").">$name</td>";
         }
         $tblColHdr .= "</tr></thead>\n";
 
@@ -163,7 +163,7 @@ 
         $rowcount = $this->_isDataset ? $modx->db->getRecordCount($this->ds) : count($this->ds);
         $this->_fieldnames = explode(",", $this->fields);
         if ($rowcount == 0) {
-            $tblRows .= "<tr><td " . $this->_itemStyle . " " . $this->_itemClass . " colspan='" . $this->_colcount . "'>" . $this->noRecordMsg . "</td></tr>\n";
+            $tblRows .= "<tr><td ".$this->_itemStyle." ".$this->_itemClass." colspan='".$this->_colcount."'>".$this->noRecordMsg."</td></tr>\n";
         } else {
             // render grid items
             if ($this->pageSize <= 0) {
@@ -173,7 +173,7 @@ 
                 }
             } else {
                 if (!$this->pager) {
-                    include_once dirname(__FILE__) . "/datasetpager.class.php";
+                    include_once dirname(__FILE__)."/datasetpager.class.php";
                     $this->pager = new DataSetPager($this->id, $this->ds, $this->pageSize, $this->pageNumber);
                     $this->pager->setRenderRowFnc($this); // pass this object
                     $this->pager->cssStyle = $pagerStyle;
@@ -194,17 +194,17 @@ 
         $ptop = (substr($this->pagerLocation, 0, 3) == "top") || (substr($this->pagerLocation, 0, 4) == "both");
         $pbot = (substr($this->pagerLocation, 0, 3) == "bot") || (substr($this->pagerLocation, 0, 4) == "both");
         if ($this->header) {
-            $o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->header . "</td></tr>";
+            $o .= "<tr><td bgcolor='#ffffff' colspan='".$this->_colcount."'>".$this->header."</td></tr>";
         }
         if ($tblPager && $ptop) {
-            $o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
+            $o .= "<tr><td align='".(substr($this->pagerLocation, -4) == "left" ? "left" : "right")."' $pagerClass $pagerStyle colspan='".$this->_colcount."'>".$tblPager."&nbsp;</td></tr>";
         }
-        $o .= $tblColHdr . $tblRows;
+        $o .= $tblColHdr.$tblRows;
         if ($tblPager && $pbot) {
-            $o .= "<tr><td align='" . (substr($this->pagerLocation, -4) == "left" ? "left" : "right") . "' $pagerClass $pagerStyle colspan='" . $this->_colcount . "'>" . $tblPager . "&nbsp;</td></tr>";
+            $o .= "<tr><td align='".(substr($this->pagerLocation, -4) == "left" ? "left" : "right")."' $pagerClass $pagerStyle colspan='".$this->_colcount."'>".$tblPager."&nbsp;</td></tr>";
         }
         if ($this->footer) {
-            $o .= "<tr><td bgcolor='#ffffff' colspan='" . $this->_colcount . "'>" . $this->footer . "</td></tr>";
+            $o .= "<tr><td bgcolor='#ffffff' colspan='".$this->_colcount."'>".$this->footer."</td></tr>";
         }
         $o .= $tblEnd;
         return $o;
@@ -234,10 +234,10 @@ 
             $nowrap = isset($this->_colwraps[$c]) ? $this->_colwraps[$c] : null;
             $value = $row[($this->_isDataset && $fld ? $fld : $c)];
             if ($color && $Style) {
-                $colStyle = substr($colStyle, 0, -1) . ";background-color:$color;'";
+                $colStyle = substr($colStyle, 0, -1).";background-color:$color;'";
             }
             $value = $this->formatColumnValue($row, $value, $type, $align);
-            $o .= "<td $colStyle $Class" . ($align ? " align='$align'" : "") . ($color ? " bgcolor='$color'" : "") . ($nowrap ? " nowrap='$nowrap'" : "") . ($width ? " width='$width'" : "") . ">$value</td>";
+            $o .= "<td $colStyle $Class".($align ? " align='$align'" : "").($color ? " bgcolor='$color'" : "").($nowrap ? " nowrap='$nowrap'" : "").($width ? " width='$width'" : "").">$value</td>";
         }
         $o .= "</tr>\n";
         return $o;
@@ -273,7 +273,7 @@ 
                 if (!$type_format) {
                     $type_format = 2;
                 }
-                $value = "$" . number_format($value, $type_format);
+                $value = "$".number_format($value, $type_format);
                 break;
 
             case "date":

manager/includes/controls/datasetpager.class.php

Doc Comments +6 added lines

@@ -31,6 +31,9 @@ 
     public $renderPagerFnc;
     public $renderPagerFncArgs;
 
+    /**
+     * @param boolean|string $id
+     */
     public function __construct($id, $ds, $pageSize = 10, $pageNumber = -1)
     {
         global $_PAGE; // use view state object
@@ -82,6 +85,9 @@ 
         $this->pageSize = $ps;
     }
 
+    /**
+     * @param DataGrid $fncName
+     */
     public function setRenderRowFnc($fncName, $args = "")
     {
         $this->renderRowFnc = &$fncName;

Spacing +13 added lines, -13 removed lines

@@ -39,16 +39,16 @@ 
 
         // set id
         $__DataSetPagerCnt++;
-        $this->id = !empty($id) ? $id : "dsp" . $__DataSetPagerCnt;
+        $this->id = !empty($id) ? $id : "dsp".$__DataSetPagerCnt;
 
         // get pagenumber
         // by setting pager to -1 cause pager to load it's last page number
         if ($pageNumber == -1) {
             $pageNumber = 1;
-            if (isset($_GET["dpgn" . $this->id])) {
-                $pageNumber = $_GET["dpgn" . $this->id];
-            } elseif (isset($_PAGE['vs'][$id . '_dpgn'])) {
-                $pageNumber = $_PAGE['vs'][$id . '_dpgn'];
+            if (isset($_GET["dpgn".$this->id])) {
+                $pageNumber = $_GET["dpgn".$this->id];
+            } elseif (isset($_PAGE['vs'][$id.'_dpgn'])) {
+                $pageNumber = $_PAGE['vs'][$id.'_dpgn'];
             }
         }
         if (!is_numeric($pageNumber)) {
@@ -85,13 +85,13 @@ 
     public function setRenderRowFnc($fncName, $args = "")
     {
         $this->renderRowFnc = &$fncName;
-        $this->renderRowFncArgs = $args;    // extra agruments
+        $this->renderRowFncArgs = $args; // extra agruments
     }
 
     public function setRenderPagerFnc($fncName, $args = "")
     {
         $this->renderPagerFnc = $fncName;
-        $this->renderPagerFncArgs = $args;    // extra agruments
+        $this->renderPagerFncArgs = $args; // extra agruments
     }
 
     public function render()
@@ -134,7 +134,7 @@ 
 
         // save page number to view state if available
         if (isset($_PAGE['vs'])) {
-            $_PAGE['vs'][$this->id . '_dpgn'] = $p;
+            $_PAGE['vs'][$this->id.'_dpgn'] = $p;
         }
 
         // render pager : renderPagerFnc($cuurentPage,$pagerNumber,$arguments="");
@@ -144,15 +144,15 @@ 
             $args = $this->renderPagerFncArgs;
             if (!isset($fnc)) {
                 if ($modx->isFrontend()) {
-                    $url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full') . '?';
+                    $url = $modx->makeUrl($modx->documentIdentifier, '', '', 'full').'?';
                 } else {
-                    $url = $_SERVER['PHP_SELF'] . '?';
+                    $url = $_SERVER['PHP_SELF'].'?';
                 }
                 $i = 0;
                 foreach ($_GET as $n => $v) {
-                    if ($n != 'dpgn' . $this->id) {
+                    if ($n != 'dpgn'.$this->id) {
                         $i++;
-                        $url .= (($i > 1) ? "&" : "") . "$n=$v";
+                        $url .= (($i > 1) ? "&" : "")."$n=$v";
                     }
                 }
                 if ($i >= 1) {
@@ -167,7 +167,7 @@ 
                         $this->pager .= $fnc($p, $i);
                     }
                 } else {
-                    $this->pager .= ($p == $i) ? " <span class='" . $this->selPageClass . "' style='" . $this->selPageStyle . "'>$i</span> " : " <a href='" . $url . "dpgn" . $this->id . "=$i' class='" . $this->pageClass . "' style='" . $this->pageStyle . "'>$i</a> ";
+                    $this->pager .= ($p == $i) ? " <span class='".$this->selPageClass."' style='".$this->selPageStyle."'>$i</span> " : " <a href='".$url."dpgn".$this->id."=$i' class='".$this->pageClass."' style='".$this->pageStyle."'>$i</a> ";
                 }
             }
         }

manager/includes/extenders/dbapi.mysql.class.inc.php

Doc Comments +11 added lines

@@ -412,6 +412,9 @@ 
         }
     }
 
+    /**
+     * @param string $table
+     */
     public function save($fields, $table, $where = '')
     {
         if ($where === '') {
@@ -441,6 +444,7 @@ 
     /**
      * @name:  freeResult
      *
+     * @param mysqli_result $rs
      */
     public function freeResult($rs)
     {
@@ -551,6 +555,7 @@ 
      * @name:  getColumn
      * @desc:  returns an array of the values found on colun $name
      * @param: $dsq - dataset or query string
+     * @param string $name
      */
     public function getColumn($name, $dsq)
     {
@@ -716,6 +721,9 @@ 
         return $result;
     }
 
+    /**
+     * @param string $table_name
+     */
     public function optimize($table_name)
     {
         $rs = $this->query("OPTIMIZE TABLE {$table_name}");
@@ -726,6 +734,9 @@ 
         return $rs;
     }
 
+    /**
+     * @param string $table_name
+     */
     public function truncate($table_name)
     {
         $rs = $this->query("TRUNCATE {$table_name}");

manager/includes/extenders/modifiers.class.inc.php

Doc Comments +27 added lines, -1 removed lines

@@ -101,7 +101,7 @@ 
     /**
      * @param string $mode
      * @param string $modifiers
-     * @return bool|string
+     * @return false|string
      */
     public function _getDelim($mode, $modifiers)
     {
@@ -149,6 +149,14 @@ 
             return $opt;
         }
     }
+
+    /**
+     * @param string $mode
+     * @param false|string $delim
+     * @param string $modifiers
+     *
+     * @return string
+     */
     public function _getRemainModifiers($mode, $delim, $modifiers)
     {
         if ($delim) {
@@ -182,6 +190,9 @@ 
         return substr($string, strpos($string, $delim)+$len);
     }
 
+    /**
+     * @param string $modifiers
+     */
     public function splitEachModifiers($modifiers)
     {
         $modx = evolutionCMS();
@@ -253,6 +264,10 @@ 
         return $result;
     }
 
+    /**
+     * @param string $key
+     * @param string $value
+     */
     public function parsePhx($key, $value, $modifiers)
     {
         $modx = evolutionCMS();
@@ -332,6 +347,10 @@ 
         }
     }
 
+    /**
+     * @param string $cmd
+     * @param string $opt
+     */
     public function getValueFromPreset($key, $value, $cmd, $opt)
     {
         $modx = evolutionCMS();
@@ -1185,6 +1204,9 @@ 
         return $value;
     }
 
+    /**
+     * @param string $cmd
+     */
     public function includeMdfFile($cmd)
     {
         $modx = evolutionCMS();
@@ -1374,6 +1396,10 @@ 
     }
 
     // Sets a placeholder variable which can only be access by Modifiers
+
+    /**
+     * @param string $value
+     */
     public function setModifiersVariable($key, $value)
     {
         if ($key != 'phx' && $key != 'dummy') {

Spacing +186 added lines, -186 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if (!defined('MODX_CORE_PATH')) {
-    define('MODX_CORE_PATH', MODX_MANAGER_PATH . 'includes/');
+    define('MODX_CORE_PATH', MODX_MANAGER_PATH.'includes/');
 }
 
 class MODIFIERS
@@ -78,13 +78,13 @@ 
     public function phxFilter($key, $value, $modifiers)
     {
         $modx = evolutionCMS();
-        if (substr($modifiers, 0, 3)!=='id(') {
+        if (substr($modifiers, 0, 3) !== 'id(') {
             $value = $this->parseDocumentSource($value);
         }
         $this->srcValue = $value;
         $modifiers = trim($modifiers);
-        $modifiers = ':' . trim($modifiers, ':');
-        $modifiers = str_replace(array("\r\n","\r"), "\n", $modifiers);
+        $modifiers = ':'.trim($modifiers, ':');
+        $modifiers = str_replace(array("\r\n", "\r"), "\n", $modifiers);
         $modifiers = $this->splitEachModifiers($modifiers);
 
         $this->placeholders = array();
@@ -92,7 +92,7 @@ 
         $this->placeholders['dummy'] = '';
         $this->condition = array();
         $this->vars = array();
-        $this->vars['name']    = & $key;
+        $this->vars['name'] = & $key;
         $value = $this->parsePhx($key, $value, $modifiers);
         $this->vars = array();
         return $value;
@@ -111,8 +111,8 @@ 
         }
 
         $modifiers = substr($modifiers, 1);
-        $closure = $mode=='(' ? "{$c})" : $c;
-        if (strpos($modifiers, $closure)===false) {
+        $closure = $mode == '(' ? "{$c})" : $c;
+        if (strpos($modifiers, $closure) === false) {
             return false;
         }
 
@@ -128,23 +128,23 @@ 
     public function _getOpt($mode, $delim, $modifiers)
     {
         if ($delim) {
-            if ($mode=='(') {
-                return substr($modifiers, 1, strpos($modifiers, $delim . ')')-1);
+            if ($mode == '(') {
+                return substr($modifiers, 1, strpos($modifiers, $delim.')') - 1);
             }
 
-            return substr($modifiers, 1, strpos($modifiers, $delim, 1)-1);
+            return substr($modifiers, 1, strpos($modifiers, $delim, 1) - 1);
         } else {
-            if ($mode=='(') {
+            if ($mode == '(') {
                 return substr($modifiers, 0, strpos($modifiers, ')'));
             }
 
             $chars = str_split($modifiers);
-            $opt='';
+            $opt = '';
             foreach ($chars as $c) {
-                if ($c==':' || $c==')') {
+                if ($c == ':' || $c == ')') {
                     break;
                 }
-                $opt .=$c;
+                $opt .= $c;
             }
             return $opt;
         }
@@ -152,20 +152,20 @@ 
     public function _getRemainModifiers($mode, $delim, $modifiers)
     {
         if ($delim) {
-            if ($mode=='(') {
-                return $this->_fetchContent($modifiers, $delim . ')');
+            if ($mode == '(') {
+                return $this->_fetchContent($modifiers, $delim.')');
             } else {
                 $modifiers = trim($modifiers);
                 $modifiers = substr($modifiers, 1);
                 return $this->_fetchContent($modifiers, $delim);
             }
         } else {
-            if ($mode=='(') {
+            if ($mode == '(') {
                 return $this->_fetchContent($modifiers, ')');
             }
             $chars = str_split($modifiers);
             foreach ($chars as $c) {
-                if ($c==':') {
+                if ($c == ':') {
                     return $modifiers;
                 } else {
                     $modifiers = substr($modifiers, 1);
@@ -179,7 +179,7 @@ 
     {
         $len = strlen($delim);
         $string = $this->parseDocumentSource($string);
-        return substr($string, strpos($string, $delim)+$len);
+        return substr($string, strpos($string, $delim) + $len);
     }
 
     public function splitEachModifiers($modifiers)
@@ -189,16 +189,16 @@ 
         $cmd = '';
         $bt = '';
         $result = array();
-        while ($bt!==$modifiers) {
+        while ($bt !== $modifiers) {
             $bt = $modifiers;
             $c = substr($modifiers, 0, 1);
             $modifiers = substr($modifiers, 1);
 
-            if ($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+            if ($c === ':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
                 $c = substr($modifiers, strlen($match[1]), 1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
-                if ($c==='(') {
-                    $modifiers = substr($modifiers, strlen($match[1])+1);
+                if ($c === '(') {
+                    $modifiers = substr($modifiers, strlen($match[1]) + 1);
                 } else {
                     $modifiers = substr($modifiers, strlen($match[1]));
                 }
@@ -207,33 +207,33 @@ 
                 $opt       = $this->_getOpt($c, $delim, $modifiers);
                 $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
 
-                $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($match[1]), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
                 $cmd = '';
-            } elseif (in_array($c, array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
+            } elseif (in_array($c, array('+', '-', '*', '/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
                 $modifiers = substr($modifiers, strlen($match[0]));
-                $result[]=array('cmd'=>'math','opt'=>'%s' . $c . $match[0]);
+                $result[] = array('cmd'=>'math', 'opt'=>'%s'.$c.$match[0]);
                 $cmd = '';
-            } elseif ($c==='(' || $c==='=') {
+            } elseif ($c === '(' || $c === '=') {
                 $modifiers = $m1 = trim($modifiers);
                 $delim     = $this->_getDelim($c, $modifiers);
                 $opt       = $this->_getOpt($c, $delim, $modifiers);
                 $modifiers = trim($this->_getRemainModifiers($c, $delim, $modifiers));
                 $debuginfo = "#i=1 #c=[{$c}] #delim=[{$delim}] #m1=[{$m1}] remainMdf=[{$modifiers}]";
 
-                $result[]=array('cmd'=>trim($cmd),'opt'=>$opt,'debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>$opt, 'debuginfo'=>$debuginfo);
 
                 $cmd = '';
-            } elseif ($c==':') {
+            } elseif ($c == ':') {
                 $debuginfo = "#i=2 #c=[{$c}] #m=[{$modifiers}]";
-                if ($cmd!=='') {
-                    $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                if ($cmd !== '') {
+                    $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
                 }
 
                 $cmd = '';
-            } elseif (trim($modifiers)=='' && trim($cmd)!=='') {
+            } elseif (trim($modifiers) == '' && trim($cmd) !== '') {
                 $debuginfo = "#i=3 #c=[{$c}] #m=[{$modifiers}]";
                 $cmd .= $c;
-                $result[]=array('cmd'=>trim($cmd),'opt'=>'','debuginfo'=>$debuginfo);
+                $result[] = array('cmd'=>trim($cmd), 'opt'=>'', 'debuginfo'=>$debuginfo);
 
                 break;
             } else {
@@ -270,8 +270,8 @@ 
         }
         $_ = explode(',', $this->condModifiers);
         if (in_array($lastKey, $_)) {
-            $modifiers[] = array('cmd'=>'then','opt'=>'1');
-            $modifiers[] = array('cmd'=>'else','opt'=>'0');
+            $modifiers[] = array('cmd'=>'then', 'opt'=>'1');
+            $modifiers[] = array('cmd'=>'else', 'opt'=>'0');
         }
 
         foreach ($modifiers as $i=>$a) {
@@ -282,17 +282,17 @@ 
     }
 
     // Parser: modifier detection and eXtended processing if needed
-    public function Filter($key, $value, $cmd, $opt='')
+    public function Filter($key, $value, $cmd, $opt = '')
     {
         $modx = evolutionCMS();
 
-        if ($key==='documentObject') {
+        if ($key === 'documentObject') {
             $value = $modx->documentIdentifier;
         }
         $cmd = $this->parseDocumentSource($cmd);
         if (preg_match('@^[1-9][/0-9]*$@', $cmd)) {
-            if (strpos($cmd, '/')!==false) {
-                $cmd = $this->substr($cmd, strrpos($cmd, '/')+1);
+            if (strpos($cmd, '/') !== false) {
+                $cmd = $this->substr($cmd, strrpos($cmd, '/') + 1);
             }
             $opt = $cmd;
             $cmd = 'id';
@@ -307,7 +307,7 @@ 
         }
 
         $cmd = strtolower($cmd);
-        if ($this->elmName!=='') {
+        if ($this->elmName !== '') {
             $value = $this->getValueFromElement($key, $value, $cmd, $opt);
         } else {
             $value = $this->getValueFromPreset($key, $value, $cmd, $opt);
@@ -320,11 +320,11 @@ 
 
     public function isEmpty($cmd, $value)
     {
-        if ($value!=='') {
+        if ($value !== '') {
             return false;
         }
 
-        $_ = explode(',', $this->condModifiers . ',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
+        $_ = explode(',', $this->condModifiers.',_default,default,if,input,or,and,show,this,select,switch,then,else,id,ifempty,smart_desc,smart_description,summary');
         if (in_array($cmd, $_)) {
             return false;
         } else {
@@ -356,56 +356,56 @@ 
             case 'eq':
             case 'is':
             case 'equals':
-                $this->condition[] = (int)($value == $opt); break;
+                $this->condition[] = (int) ($value == $opt); break;
             case 'neq':
             case 'ne':
             case 'notequals':
             case 'isnot':
             case 'isnt':
             case 'not':
-                $this->condition[] = (int)($value != $opt);break;
+                $this->condition[] = (int) ($value != $opt); break;
             case '%':
-                $this->condition[] = (int)($value%$opt==0);break;
+                $this->condition[] = (int) ($value % $opt == 0); break;
             case 'isempty':
-                $this->condition[] = (int)(empty($value)); break;
+                $this->condition[] = (int) (empty($value)); break;
             case 'isntempty':
             case 'isnotempty':
-                $this->condition[] = (int)(!empty($value)); break;
+                $this->condition[] = (int) (!empty($value)); break;
             case '>=':
             case 'gte':
             case 'eg':
             case 'isgte':
-                $this->condition[] = (int)($value >= $opt);break;
+                $this->condition[] = (int) ($value >= $opt); break;
             case '<=':
             case 'lte':
             case 'el':
             case 'islte':
-                $this->condition[] = (int)($value <= $opt);break;
+                $this->condition[] = (int) ($value <= $opt); break;
             case '>':
             case 'gt':
             case 'greaterthan':
             case 'isgreaterthan':
             case 'isgt':
-                $this->condition[] = (int)($value > $opt);break;
+                $this->condition[] = (int) ($value > $opt); break;
             case '<':
             case 'lt':
             case 'lowerthan':
             case 'islowerthan':
             case 'islt':
-                $this->condition[] = (int)($value < $opt);break;
+                $this->condition[] = (int) ($value < $opt); break;
             case 'find':
-                $this->condition[] = (int)(strpos($value, $opt)!==false);break;
+                $this->condition[] = (int) (strpos($value, $opt) !== false); break;
             case 'inarray':
             case 'in_array':
             case 'in':
                 $opt = explode(',', $opt);
-                $this->condition[] = (int)(in_array($value, $opt)!==false);break;
+                $this->condition[] = (int) (in_array($value, $opt) !== false); break;
             case 'wildcard_match':
             case 'wcard_match':
             case 'wildcard':
             case 'wcard':
             case 'fnmatch':
-                $this->condition[] = (int)(fnmatch($opt, $value)!==false);break;
+                $this->condition[] = (int) (fnmatch($opt, $value) !== false); break;
             case 'is_file':
             case 'is_dir':
             case 'file_exists':
@@ -416,13 +416,13 @@ 
                 } else {
                     $path = $opt;
                 }
-                if (strpos($path, MODX_MANAGER_PATH)!==false) {
+                if (strpos($path, MODX_MANAGER_PATH) !== false) {
                     exit('Can not read core path');
                 }
-                if (strpos($path, $modx->config['base_path'])===false) {
+                if (strpos($path, $modx->config['base_path']) === false) {
                     $path = ltrim($path, '/');
                 }
-                $this->condition[] = (int)($cmd($path)!==false);break;
+                $this->condition[] = (int) ($cmd($path) !== false); break;
             case 'is_image':
                 if (!$opt) {
                     $path = $value;
@@ -430,16 +430,16 @@ 
                     $path = $opt;
                 }
                 if (!is_file($path)) {
-                    $this->condition[]='0';
+                    $this->condition[] = '0';
                     break;
                 }
                 $_ = getimagesize($path);
-                $this->condition[] = (int)($_[0]);break;
+                $this->condition[] = (int) ($_[0]); break;
             case 'regex':
             case 'preg':
             case 'preg_match':
             case 'isinrole':
-            $this->condition[] = (int)(preg_match($opt, $value));break;
+            $this->condition[] = (int) (preg_match($opt, $value)); break;
             case 'ir':
             case 'memberof':
             case 'mo':
@@ -447,27 +447,27 @@ 
                 $this->condition[] = $this->includeMdfFile('memberof');
                 break;
             case 'or':
-                $this->condition[] = '||';break;
+                $this->condition[] = '||'; break;
             case 'and':
-                $this->condition[] = '&&';break;
+                $this->condition[] = '&&'; break;
             case 'show':
             case 'this':
                 $conditional = implode(' ', $this->condition);
-                $isvalid = (int)(eval("return ({$conditional});"));
+                $isvalid = (int) (eval("return ({$conditional});"));
                 if ($isvalid) {
                     return $this->srcValue;
                 }
                 return null;
             case 'then':
                 $conditional = implode(' ', $this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $isvalid = (int) eval("return ({$conditional});");
                 if ($isvalid) {
                     return $opt;
                 }
                 return null;
             case 'else':
                 $conditional = implode(' ', $this->condition);
-                $isvalid = (int)eval("return ({$conditional});");
+                $isvalid = (int) eval("return ({$conditional});");
                 if (!$isvalid) {
                     return $opt;
                 }
@@ -477,7 +477,7 @@ 
                 $raw = explode('&', $opt);
                 $map = array();
                 $c = count($raw);
-                for ($m=0; $m<$c; $m++) {
+                for ($m = 0; $m < $c; $m++) {
                     $mi = explode('=', $raw[$m], 2);
                     $map[$mi[0]] = $mi[1];
                 }
@@ -510,18 +510,18 @@ 
             case 'html_encode':
                 return preg_replace('/&amp;(#[0-9]+|[a-z]+);/i', '&$1;', htmlspecialchars($value, ENT_QUOTES, $modx->config['modx_charset']));
             case 'spam_protect':
-                return str_replace(array('@','.'), array('&#64;','&#46;'), $value);
+                return str_replace(array('@', '.'), array('&#64;', '&#46;'), $value);
             case 'strip':
-                if ($opt==='') {
+                if ($opt === '') {
                     $opt = ' ';
                 }
                 return preg_replace('/[\n\r\t\s]+/', $opt, $value);
             case 'strip_linefeeds':
-                return str_replace(array("\n","\r"), '', $value);
+                return str_replace(array("\n", "\r"), '', $value);
             case 'notags':
             case 'strip_tags':
             case 'remove_html':
-                if ($opt!=='') {
+                if ($opt !== '') {
                     $param = array();
                     foreach (explode(',', $opt) as $v) {
                         $v = trim($v, '</> ');
@@ -531,7 +531,7 @@ 
                 } else {
                     $params = '';
                 }
-                if (!strpos($params, '<br>')===false) {
+                if (!strpos($params, '<br>') === false) {
                     $value = preg_replace('@(<br[ /]*>)\n@', '$1', $value);
                     $value = preg_replace('@<br[ /]*>@', "\n", $value);
                 }
@@ -541,7 +541,7 @@ 
             case 'encode_url':
                 return urlencode($value);
             case 'base64_decode':
-                if ($opt!=='false') {
+                if ($opt !== 'false') {
                     $opt = true;
                 } else {
                     $opt = false;
@@ -578,12 +578,12 @@ 
                 return implode(' ', $_);
             case 'zenhan':
                 if (empty($opt)) {
-                    $opt='VKas';
+                    $opt = 'VKas';
                 }
                 return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'hanzen':
                 if (empty($opt)) {
-                    $opt='VKAS';
+                    $opt = 'VKAS';
                 }
                 return mb_convert_kana($value, $opt, $modx->config['modx_charset']);
             case 'str_shuffle':
@@ -609,13 +609,13 @@ 
                 $value = preg_replace('/\r/', '', $value);
                 return count(preg_split('/\n+/', $value));
             case 'strpos':
-                if ($opt!=0&&empty($opt)) {
+                if ($opt != 0 && empty($opt)) {
                     return $value;
                 }
                 return $this->strpos($value, $opt);
             case 'wordwrap':
                 // default: 70
-                  $wrapat = (int)$opt > 0 ? (int)$opt : 70;
+                  $wrapat = (int) $opt > 0 ? (int) $opt : 70;
                 if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
                     return $this->includeMdfFile('wordwrap');
                 } else {
@@ -624,12 +624,12 @@ 
                 // no break
             case 'wrap_text':
                 $width = preg_match('/^[1-9][0-9]*$/', $opt) ? $opt : 70;
-                if ($modx->config['manager_language']==='japanese-utf8') {
+                if ($modx->config['manager_language'] === 'japanese-utf8') {
                     $chunk = array();
-                    $bt='';
-                    while ($bt!=$value) {
+                    $bt = '';
+                    while ($bt != $value) {
                         $bt = $value;
-                        if ($this->strlen($value)<$width) {
+                        if ($this->strlen($value) < $width) {
                             $chunk[] = $value;
                             break;
                         }
@@ -645,31 +645,31 @@ 
                 if (empty($opt)) {
                     break;
                 }
-                if (strpos($opt, ',')!==false) {
+                if (strpos($opt, ',') !== false) {
                     list($b, $e) = explode(',', $opt, 2);
-                    return $this->substr($value, $b, (int)$e);
+                    return $this->substr($value, $b, (int) $e);
                 } else {
                     return $this->substr($value, $opt);
                 }
                 // no break
             case 'limit':
             case 'trim_to': // http://www.movabletype.jp/documentation/appendices/modifiers/trim_to.html
-                if (strpos($opt, '+')!==false) {
+                if (strpos($opt, '+') !== false) {
                     list($len, $str) = explode('+', $opt, 2);
                 } else {
                     $len = $opt;
                     $str = '';
                 }
-                if ($len==='') {
+                if ($len === '') {
                     $len = 100;
                 }
                 if (abs($len) > $this->strlen($value)) {
-                    $str ='';
+                    $str = '';
                 }
                 if (preg_match('/^[1-9][0-9]*$/', $len)) {
-                    return $this->substr($value, 0, $len) . $str;
+                    return $this->substr($value, 0, $len).$str;
                 } elseif (preg_match('/^\-[1-9][0-9]*$/', $len)) {
-                    return $str . $this->substr($value, $len);
+                    return $str.$this->substr($value, $len);
                 }
                 break;
             case 'summary':
@@ -678,41 +678,41 @@ 
                 return $this->includeMdfFile('summary');
             case 'replace':
             case 'str_replace':
-                if (empty($opt) || strpos($opt, ',')===false) {
+                if (empty($opt) || strpos($opt, ',') === false) {
                     break;
                 }
-                if (substr_count($opt, ',') ==1) {
+                if (substr_count($opt, ',') == 1) {
                     $delim = ',';
-                } elseif (substr_count($opt, '|') ==1) {
+                } elseif (substr_count($opt, '|') == 1) {
                     $delim = '|';
-                } elseif (substr_count($opt, '=>')==1) {
+                } elseif (substr_count($opt, '=>') == 1) {
                     $delim = '=>';
-                } elseif (substr_count($opt, '/') ==1) {
+                } elseif (substr_count($opt, '/') == 1) {
                     $delim = '/';
                 } else {
                     break;
                 }
                 list($s, $r) = explode($delim, $opt);
-                if ($value!=='') {
+                if ($value !== '') {
                     return str_replace($s, $r, $value);
                 }
                 break;
             case 'replace_to':
             case 'tpl':
-                if ($value!=='') {
-                    return str_replace(array('[+value+]','[+output+]','{value}','%s'), $value, $opt);
+                if ($value !== '') {
+                    return str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $value, $opt);
                 }
                 break;
             case 'eachtpl':
                 $value = explode('||', $value);
                 $_ = array();
                 foreach ($value as $v) {
-                    $_[] = str_replace(array('[+value+]','[+output+]','{value}','%s'), $v, $opt);
+                    $_[] = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), $v, $opt);
                 }
                 return implode("\n", $_);
             case 'array_pop':
             case 'array_shift':
-                if (strpos($value, '||')!==false) {
+                if (strpos($value, '||') !== false) {
                     $delim = '||';
                 } else {
                     $delim = ',';
@@ -720,43 +720,43 @@ 
                 return $cmd(explode($delim, $value));
             case 'preg_replace':
             case 'regex_replace':
-                if (empty($opt) || strpos($opt, ',')===false) {
+                if (empty($opt) || strpos($opt, ',') === false) {
                     break;
                 }
                 list($s, $r) = explode(',', $opt, 2);
-                if ($value!=='') {
+                if ($value !== '') {
                     return preg_replace($s, $r, $value);
                 }
                 break;
             case 'cat':
             case 'concatenate':
             case '.':
-                if ($value!=='') {
-                    return $value . $opt;
+                if ($value !== '') {
+                    return $value.$opt;
                 }
                 break;
             case 'sprintf':
             case 'string_format':
-                if ($value!=='') {
+                if ($value !== '') {
                     return sprintf($opt, $value);
                 }
                 break;
             case 'number_format':
-                    if ($opt=='') {
+                    if ($opt == '') {
                         $opt = 0;
                     }
                     return number_format($value, $opt);
             case 'money_format':
                     setlocale(LC_MONETARY, setlocale(LC_TIME, 0));
-                    if ($value!=='') {
-                        return money_format($opt, (double)$value);
+                    if ($value !== '') {
+                        return money_format($opt, (double) $value);
                     }
                     break;
             case 'tobool':
                 return boolval($value);
             case 'nl2lf':
-                if ($value!=='') {
-                    return str_replace(array("\r\n","\n", "\r"), '\n', $value);
+                if ($value !== '') {
+                    return str_replace(array("\r\n", "\n", "\r"), '\n', $value);
                 }
                 break;
             case 'br2nl':
@@ -765,17 +765,17 @@ 
                 if (version_compare(PHP_VERSION, '5.3.0', '<')) {
                     return nl2br($value);
                 }
-                if ($opt!=='') {
+                if ($opt !== '') {
                     $opt = trim($opt);
                     $opt = strtolower($opt);
-                    if ($opt==='false') {
+                    if ($opt === 'false') {
                         $opt = false;
-                    } elseif ($opt==='0') {
+                    } elseif ($opt === '0') {
                         $opt = false;
                     } else {
                         $opt = true;
                     }
-                } elseif (isset($modx->config['mce_element_format'])&&$modx->config['mce_element_format']==='html') {
+                } elseif (isset($modx->config['mce_element_format']) && $modx->config['mce_element_format'] === 'html') {
                     $opt = false;
                 } else {
                     $opt = true;
@@ -784,7 +784,7 @@ 
             case 'ltrim':
             case 'rtrim':
             case 'trim': // ref http://mblo.info/modifiers/custom-modifiers/rtrim_opt.html
-                if ($opt==='') {
+                if ($opt === '') {
                     return $cmd($value);
                 } else {
                     return $cmd($value, $opt);
@@ -806,10 +806,10 @@ 
                 if (!preg_match('@^[0-9]+$@', $value)) {
                     $value = strtotime($value);
                 }
-                if (strpos($opt, '%')!==false) {
-                    return strftime($opt, 0+$value);
+                if (strpos($opt, '%') !== false) {
+                    return strftime($opt, 0 + $value);
                 } else {
-                    return date($opt, 0+$value);
+                    return date($opt, 0 + $value);
                 }
                     // no break
             case 'time':
@@ -819,12 +819,12 @@ 
                 if (!preg_match('@^[0-9]+$@', $value)) {
                     $value = strtotime($value);
                 }
-                return strftime($opt, 0+$value);
+                return strftime($opt, 0 + $value);
             case 'strtotime':
                 return strtotime($value);
             #####  mathematical function
             case 'toint':
-                return (int)$value;
+                return (int) $value;
             case 'tofloat':
                 return floatval($value);
             case 'round':
@@ -841,27 +841,27 @@ 
                 return $cmd($value);
             case 'math':
             case 'calc':
-                $value = (int)$value;
+                $value = (int) $value;
                 if (empty($value)) {
                     $value = '0';
                 }
-                $filter = str_replace(array('[+value+]','[+output+]','{value}','%s'), '?', $opt);
+                $filter = str_replace(array('[+value+]', '[+output+]', '{value}', '%s'), '?', $opt);
                 $filter = preg_replace('@([a-zA-Z\n\r\t\s])@', '', $filter);
-                if (strpos($filter, '?')===false) {
+                if (strpos($filter, '?') === false) {
                     $filter = "?{$filter}";
                 }
                 $filter = str_replace('?', $value, $filter);
                 return eval("return {$filter};");
             case 'count':
-                if ($value=='') {
+                if ($value == '') {
                     return 0;
                 }
                 $value = explode(',', $value);
                 return count($value);
             case 'sort':
             case 'rsort':
-                if (strpos($value, "\n")!==false) {
-                    $delim="\n";
+                if (strpos($value, "\n") !== false) {
+                    $delim = "\n";
                 } else {
                     $delim = ',';
                 }
@@ -914,7 +914,7 @@ 
             case 'privatemgr':
             case 'content_dispo':
             case 'hidemenu':
-                if ($cmd==='contenttype') {
+                if ($cmd === 'contenttype') {
                     $cmd = 'contentType';
                 }
                 return $this->getDocumentObject($value, $cmd);
@@ -937,11 +937,11 @@ 
                 return $modx->getField($opt, $value);
             case 'children':
             case 'childids':
-                if ($value=='') {
+                if ($value == '') {
                     $value = 0;
                 } // 値がない場合はルートと見なす
                 $published = 1;
-                if ($opt=='') {
+                if ($opt == '') {
                     $opt = 'page';
                 }
                 $_ = explode(',', $opt);
@@ -959,7 +959,7 @@ 
                 $where = implode(' AND ', $where);
                 $children = $modx->getDocumentChildren($value, $published, '0', 'id', $where);
                 $result = array();
-                foreach ((array)$children as $child) {
+                foreach ((array) $children as $child) {
                     $result[] = $child['id'];
                 }
                 return implode(',', $result);
@@ -1019,14 +1019,14 @@ 
                     return $value;
                 }
                 $value = realpath($value);
-                if (strpos($value, MODX_MANAGER_PATH)!==false) {
+                if (strpos($value, MODX_MANAGER_PATH) !== false) {
                     exit('Can not read core file');
                 }
                 $ext = strtolower(substr($value, -4));
-                if ($ext==='.php') {
+                if ($ext === '.php') {
                     exit('Can not read php file');
                 }
-                if ($ext==='.cgi') {
+                if ($ext === '.cgi') {
                     exit('Can not read cgi file');
                 }
                 return file_get_contents($value);
@@ -1043,11 +1043,11 @@ 
                 $filename = trim($filename, '/');
 
                 $opt = trim($opt, '/');
-                if ($opt!=='') {
+                if ($opt !== '') {
                     $opt .= '/';
                 }
 
-                $filename = MODX_BASE_PATH . $opt . $filename;
+                $filename = MODX_BASE_PATH.$opt.$filename;
 
                 if (is_file($filename)) {
                     clearstatcache();
@@ -1106,7 +1106,7 @@ 
                     return $opt;
                 } break;
             case 'datagrid':
-                include_once(MODX_CORE_PATH . 'controls/datagrid.class.php');
+                include_once(MODX_CORE_PATH.'controls/datagrid.class.php');
                 $grd = new DataGrid(null, trim($value));
                 $grd->itemStyle = '';
                 $grd->altItemStyle = '';
@@ -1116,11 +1116,11 @@ 
                 } else {
                     $_ = $pos;
                 }
-                $grd->cdelim = strpos($_, "\t")!==false ? 'tab' : ',';
+                $grd->cdelim = strpos($_, "\t") !== false ? 'tab' : ',';
                 return $grd->render();
             case 'rotate':
             case 'evenodd':
-                if (strpos($opt, ',')===false) {
+                if (strpos($opt, ',') === false) {
                     $opt = 'odd,even';
                 }
                 $_ = explode(',', $opt);
@@ -1153,7 +1153,7 @@ 
                 if (empty($opt)) {
                     $opt = 560;
                 }
-                $h = round($opt*0.5625);
+                $h = round($opt * 0.5625);
                 $tpl = '<iframe width="%s" height="%s" src="https://www.youtube.com/embed/%s" frameborder="0" allowfullscreen></iframe>';
                 return sprintf($tpl, $opt, $h, $value);
             //case 'youtube4x3':%s*0.75＋25
@@ -1191,7 +1191,7 @@ 
         $key = $this->key;
         $value  = $this->value;
         $opt    = $this->opt;
-        return include(MODX_CORE_PATH . "extenders/modifiers/mdf_{$cmd}.inc.php");
+        return include(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php");
     }
 
     public function getValueFromElement($key, $value, $cmd, $opt)
@@ -1207,13 +1207,13 @@ 
                 $row = $modx->db->getRow($result);
                 $php = $row['snippet'];
             } elseif ($total == 0) {
-                $assets_path = MODX_BASE_PATH . 'assets/';
-                if (is_file($assets_path . "modifiers/mdf_{$cmd}.inc.php")) {
-                    $modifiers_path = $assets_path . "modifiers/mdf_{$cmd}.inc.php";
-                } elseif (is_file($assets_path . "plugins/phx/modifiers/{$cmd}.phx.php")) {
-                    $modifiers_path = $assets_path . "plugins/phx/modifiers/{$cmd}.phx.php";
-                } elseif (is_file(MODX_CORE_PATH . "extenders/modifiers/mdf_{$cmd}.inc.php")) {
-                    $modifiers_path = MODX_CORE_PATH . "extenders/modifiers/mdf_{$cmd}.inc.php";
+                $assets_path = MODX_BASE_PATH.'assets/';
+                if (is_file($assets_path."modifiers/mdf_{$cmd}.inc.php")) {
+                    $modifiers_path = $assets_path."modifiers/mdf_{$cmd}.inc.php";
+                } elseif (is_file($assets_path."plugins/phx/modifiers/{$cmd}.phx.php")) {
+                    $modifiers_path = $assets_path."plugins/phx/modifiers/{$cmd}.phx.php";
+                } elseif (is_file(MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php")) {
+                    $modifiers_path = MODX_CORE_PATH."extenders/modifiers/mdf_{$cmd}.inc.php";
                 } else {
                     $modifiers_path = false;
                 }
@@ -1221,17 +1221,17 @@ 
                 if ($modifiers_path !== false) {
                     $php = @file_get_contents($modifiers_path);
                     $php = trim($php);
-                    if (substr($php, 0, 5)==='<?php') {
+                    if (substr($php, 0, 5) === '<?php') {
                         $php = substr($php, 6);
                     }
-                    if (substr($php, 0, 2)==='<?') {
+                    if (substr($php, 0, 2) === '<?') {
                         $php = substr($php, 3);
                     }
-                    if (substr($php, -2)==='?>') {
+                    if (substr($php, -2) === '?>') {
                         $php = substr($php, 0, -2);
                     }
-                    if ($this->elmName!=='') {
-                        $modx->snippetCache[$this->elmName . 'Props'] = '';
+                    if ($this->elmName !== '') {
+                        $modx->snippetCache[$this->elmName.'Props'] = '';
                     }
                 } else {
                     $php = false;
@@ -1239,15 +1239,15 @@ 
             } else {
                 $php = false;
             }
-            if ($this->elmName!=='') {
-                $modx->snippetCache[$this->elmName]= $php;
+            if ($this->elmName !== '') {
+                $modx->snippetCache[$this->elmName] = $php;
             }
         }
-        if ($php==='') {
-            $php=false;
+        if ($php === '') {
+            $php = false;
         }
 
-        if ($php===false) {
+        if ($php === false) {
             $html = $modx->getChunk($this->elmName);
         } else {
             $html = false;
@@ -1267,56 +1267,56 @@ 
             $this->vars['options'] = & $opt;
             $custom = eval($php);
             $msg = ob_get_contents();
-            if ($value===$this->bt) {
-                $value = $msg . $custom;
+            if ($value === $this->bt) {
+                $value = $msg.$custom;
             }
             ob_end_clean();
-        } elseif ($html!==false && isset($value) && $value!=='') {
-            $html = str_replace(array($self,'[+value+]'), $value, $html);
-            $value = str_replace(array('[+options+]','[+param+]'), $opt, $html);
+        } elseif ($html !== false && isset($value) && $value !== '') {
+            $html = str_replace(array($self, '[+value+]'), $value, $html);
+            $value = str_replace(array('[+options+]', '[+param+]'), $opt, $html);
         } else {
             return false;
         }
 
-        if ($php===false && $html===false && $value!==''
-           && (strpos($cmd, '[+value+]')!==false || strpos($cmd, $self)!==false)) {
-            $value = str_replace(array('[+value+]',$self), $value, $cmd);
+        if ($php === false && $html === false && $value !== ''
+           && (strpos($cmd, '[+value+]') !== false || strpos($cmd, $self) !== false)) {
+            $value = str_replace(array('[+value+]', $self), $value, $cmd);
         }
         return $value;
     }
 
-    public function parseDocumentSource($content='')
+    public function parseDocumentSource($content = '')
     {
         $modx = evolutionCMS();
 
-        if (strpos($content, '[')===false && strpos($content, '{')===false) {
+        if (strpos($content, '[') === false && strpos($content, '{') === false) {
             return $content;
         }
 
         if (!$modx->maxParserPasses) {
             $modx->maxParserPasses = 10;
         }
-        $bt='';
-        $i=0;
-        while ($bt!==$content) {
+        $bt = '';
+        $i = 0;
+        while ($bt !== $content) {
             $bt = $content;
-            if (strpos($content, '[*')!==false && $modx->documentIdentifier) {
+            if (strpos($content, '[*') !== false && $modx->documentIdentifier) {
                 $content = $modx->mergeDocumentContent($content);
             }
-            if (strpos($content, '[(')!==false) {
+            if (strpos($content, '[(') !== false) {
                 $content = $modx->mergeSettingsContent($content);
             }
-            if (strpos($content, '{{')!==false) {
+            if (strpos($content, '{{') !== false) {
                 $content = $modx->mergeChunkContent($content);
             }
-            if (strpos($content, '[!')!==false) {
-                $content = str_replace(array('[!','!]'), array('[[',']]'), $content);
+            if (strpos($content, '[!') !== false) {
+                $content = str_replace(array('[!', '!]'), array('[[', ']]'), $content);
             }
-            if (strpos($content, '[[')!==false) {
+            if (strpos($content, '[[') !== false) {
                 $content = $modx->evalSnippets($content);
             }
 
-            if ($content===$bt) {
+            if ($content === $bt) {
                 break;
             }
             if ($modx->maxParserPasses < $i) {
@@ -1327,7 +1327,7 @@ 
         return $content;
     }
 
-    public function getDocumentObject($target='', $field='pagetitle')
+    public function getDocumentObject($target = '', $field = 'pagetitle')
     {
         $modx = evolutionCMS();
 
@@ -1336,7 +1336,7 @@ 
             $target = $modx->config['site_start'];
         }
         if (preg_match('@^[1-9][0-9]*$@', $target)) {
-            $method='id';
+            $method = 'id';
         } else {
             $method = 'alias';
         }
@@ -1345,7 +1345,7 @@ 
             $this->documentObject[$target] = $modx->getDocumentObject($method, $target, 'direct');
         }
 
-        if ($this->documentObject[$target]['publishedon']==='0') {
+        if ($this->documentObject[$target]['publishedon'] === '0') {
             return '';
         } elseif (isset($this->documentObject[$target][$field])) {
             if (is_array($this->documentObject[$target][$field])) {
@@ -1361,7 +1361,7 @@ 
 
     public function setPlaceholders($value = '', $key = '', $path = '')
     {
-        if ($path!=='') {
+        if ($path !== '') {
             $key = "{$path}.{$key}";
         }
         if (is_array($value)) {
@@ -1389,14 +1389,14 @@ 
             $l = $this->strlen($str);
         }
         if (function_exists('mb_substr')) {
-            if (strpos($str, "\r")!==false) {
-                $str = str_replace(array("\r\n","\r"), "\n", $str);
+            if (strpos($str, "\r") !== false) {
+                $str = str_replace(array("\r\n", "\r"), "\n", $str);
             }
             return mb_substr($str, $s, $l, $modx->config['modx_charset']);
         }
         return substr($str, $s, $l);
     }
-    public function strpos($haystack, $needle, $offset=0)
+    public function strpos($haystack, $needle, $offset = 0)
     {
         $modx = evolutionCMS();
         if (function_exists('mb_strpos')) {
@@ -1429,14 +1429,14 @@ 
     public function ucfirst($str)
     {
         if (function_exists('mb_strtoupper')) {
-            return mb_strtoupper($this->substr($str, 0, 1)) . $this->substr($str, 1, $this->strlen($str));
+            return mb_strtoupper($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         }
         return ucfirst($str);
     }
     public function lcfirst($str)
     {
         if (function_exists('mb_strtolower')) {
-            return mb_strtolower($this->substr($str, 0, 1)) . $this->substr($str, 1, $this->strlen($str));
+            return mb_strtolower($this->substr($str, 0, 1)).$this->substr($str, 1, $this->strlen($str));
         }
         return lcfirst($str);
     }
@@ -1462,14 +1462,14 @@ 
     {
         return count(preg_split('~[^\p{L}\p{N}\']+~u', $str));
     }
-    public function strip_tags($value, $params='')
+    public function strip_tags($value, $params = '')
     {
         $modx = evolutionCMS();
 
-        if (stripos($params, 'style')===false && stripos($value, '</style>')!==false) {
+        if (stripos($params, 'style') === false && stripos($value, '</style>') !== false) {
             $value = preg_replace('@<style.*?>.*?</style>@is', '', $value);
         }
-        if (stripos($params, 'script')===false && stripos($value, '</script>')!==false) {
+        if (stripos($params, 'script') === false && stripos($value, '</script>') !== false) {
             $value = preg_replace('@<script.*?>.*?</script>@is', '', $value);
         }
 

Braces +4 added lines, -2 removed lines

@@ -194,7 +194,8 @@ 
             $c = substr($modifiers, 0, 1);
             $modifiers = substr($modifiers, 1);
 
-            if ($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) { // :=, :!=, :<=, :>=, :!<=, :!>=
+            if ($c===':' && preg_match('@^(!?[<>=]{1,2})@', $modifiers, $match)) {
+// :=, :!=, :<=, :>=, :!<=, :!>=
                 $c = substr($modifiers, strlen($match[1]), 1);
                 $debuginfo = "#i=0 #c=[{$c}] #m=[{$modifiers}]";
                 if ($c==='(') {
@@ -209,7 +210,8 @@ 
 
                 $result[]=array('cmd'=>trim($match[1]),'opt'=>$opt,'debuginfo'=>$debuginfo);
                 $cmd = '';
-            } elseif (in_array($c, array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) { // :+3, :-3, :*3 ...
+            } elseif (in_array($c, array('+','-','*','/')) && preg_match('@^[0-9]+@', $modifiers, $match)) {
+// :+3, :-3, :*3 ...
                 $modifiers = substr($modifiers, strlen($match[0]));
                 $result[]=array('cmd'=>'math','opt'=>'%s' . $c . $match[0]);
                 $cmd = '';

manager/includes/tmplvars.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -382,7 +382,7 @@
 } // end renderFormElement function
 
 /**
- * @param string|array|mysqli_result $v
+ * @param string $v
  * @return array
  */
 function ParseIntputOptions($v)

Spacing +32 added lines, -32 removed lines

@@ -33,22 +33,22 @@ 
 
             case "text": // handler for regular text boxes
             case "rawtext": // non-htmlentity converted text boxes
-                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" />';
+                $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%" />';
                 break;
             case "email": // handles email input fields
-                $field_html .= '<input type="email" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%"/>';
+                $field_html .= '<input type="email" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%"/>';
                 break;
             case "number": // handles the input of numbers
-                $field_html .= '<input type="number" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' tvtype="' . $field_type . '" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
+                $field_html .= '<input type="number" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' tvtype="'.$field_type.'" onchange="documentDirty=true;" style="width:100%" onkeyup="this.value=this.value.replace(/[^\d-,.+]/,\'\')"/>';
                 break;
             case "textareamini": // handler for textarea mini boxes
-                $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
+                $field_html .= '<textarea id="tv'.$field_id.'" name="tv'.$field_id.'" cols="40" rows="5" onchange="documentDirty=true;" style="width:100%">'.$modx->htmlspecialchars($field_value).'</textarea>';
                 break;
             case "textarea": // handler for textarea boxes
             case "rawtextarea": // non-htmlentity convertex textarea boxes
             case "htmlarea": // handler for textarea boxes (deprecated)
             case "richtext": // handler for textarea boxes
-                $field_html .= '<textarea id="tv' . $field_id . '" name="tv' . $field_id . '" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">' . $modx->htmlspecialchars($field_value) . '</textarea>';
+                $field_html .= '<textarea id="tv'.$field_id.'" name="tv'.$field_id.'" cols="40" rows="15" onchange="documentDirty=true;" style="width:100%">'.$modx->htmlspecialchars($field_value).'</textarea>';
                 break;
             case "date":
                 $field_id = str_replace(array(
@@ -58,44 +58,44 @@ 
                 if ($field_value == '') {
                     $field_value = 0;
                 }
-                $field_html .= '<input id="tv' . $field_id . '" name="tv' . $field_id . '" class="DatePicker" type="text" value="' . ($field_value == 0 || !isset($field_value) ? "" : $field_value) . '" onblur="documentDirty=true;" />';
-                $field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].value=\'\';document.forms[\'mutate\'].elements[\'tv' . $field_id . '\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="' . $_style["actions_calendar_delete"] . '"></i></a>';
+                $field_html .= '<input id="tv'.$field_id.'" name="tv'.$field_id.'" class="DatePicker" type="text" value="'.($field_value == 0 || !isset($field_value) ? "" : $field_value).'" onblur="documentDirty=true;" />';
+                $field_html .= ' <a onclick="document.forms[\'mutate\'].elements[\'tv'.$field_id.'\'].value=\'\';document.forms[\'mutate\'].elements[\'tv'.$field_id.'\'].onblur(); return true;" onmouseover="window.status=\'clear the date\'; return true;" onmouseout="window.status=\'\'; return true;" style="cursor:pointer; cursor:hand"><i class="'.$_style["actions_calendar_delete"].'"></i></a>';
 
                 break;
             case "dropdown": // handler for select boxes
-                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" size="1" onchange="documentDirty=true;">';
+                $field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'" size="1" onchange="documentDirty=true;">';
                 $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
                 while (list($item, $itemvalue) = each($index_list)) {
                     list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
                     if (strlen($itemvalue) == 0) {
                         $itemvalue = $item;
                     }
-                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                    $field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.($itemvalue == $field_value ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
                 }
                 $field_html .= "</select>";
                 break;
             case "listbox": // handler for select boxes
-                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '" onchange="documentDirty=true;" size="8">';
+                $field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'" onchange="documentDirty=true;" size="8">';
                 $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
                 while (list($item, $itemvalue) = each($index_list)) {
                     list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
                     if (strlen($itemvalue) == 0) {
                         $itemvalue = $item;
                     }
-                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . ($itemvalue == $field_value ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                    $field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.($itemvalue == $field_value ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
                 }
                 $field_html .= "</select>";
                 break;
             case "listbox-multiple": // handler for select boxes where you can choose multiple items
                 $field_value = explode("||", $field_value);
-                $field_html .= '<select id="tv' . $field_id . '" name="tv' . $field_id . '[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
+                $field_html .= '<select id="tv'.$field_id.'" name="tv'.$field_id.'[]" multiple="multiple" onchange="documentDirty=true;" size="8">';
                 $index_list = ParseIntputOptions(ProcessTVCommand($field_elements, $field_id, '', 'tvform', $tvsArray));
                 while (list($item, $itemvalue) = each($index_list)) {
                     list($item, $itemvalue) = (is_array($itemvalue)) ? $itemvalue : explode("==", $itemvalue);
                     if (strlen($itemvalue) == 0) {
                         $itemvalue = $item;
                     }
-                    $field_html .= '<option value="' . $modx->htmlspecialchars($itemvalue) . '"' . (in_array($itemvalue, $field_value) ? ' selected="selected"' : '') . '>' . $modx->htmlspecialchars($item) . '</option>';
+                    $field_html .= '<option value="'.$modx->htmlspecialchars($itemvalue).'"'.(in_array($itemvalue, $field_value) ? ' selected="selected"' : '').'>'.$modx->htmlspecialchars($item).'</option>';
                 }
                 $field_html .= "</select>";
                 break;
@@ -107,17 +107,17 @@ 
                     'ftp://' => 'ftp://',
                     'mailto:' => 'mailto:'
                 );
-                $field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv' . $field_id . '_prefix" name="tv' . $field_id . '_prefix" onchange="documentDirty=true;">';
+                $field_html = '<table border="0" cellspacing="0" cellpadding="0"><tr><td><select id="tv'.$field_id.'_prefix" name="tv'.$field_id.'_prefix" onchange="documentDirty=true;">';
                 foreach ($urls as $k => $v) {
                     if (strpos($field_value, $v) === false) {
-                        $field_html .= '<option value="' . $v . '">' . $k . '</option>';
+                        $field_html .= '<option value="'.$v.'">'.$k.'</option>';
                     } else {
                         $field_value = str_replace($v, '', $field_value);
-                        $field_html .= '<option value="' . $v . '" selected="selected">' . $k . '</option>';
+                        $field_html .= '<option value="'.$v.'" selected="selected">'.$k.'</option>';
                     }
                 }
                 $field_html .= '</select></td><td>';
-                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" width="100" ' . $field_style . ' onchange="documentDirty=true;" /></td></tr></table>';
+                $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" width="100" '.$field_style.' onchange="documentDirty=true;" /></td></tr></table>';
                 break;
             case 'checkbox': // handles check boxes
                 $values = !is_array($field_value) ? explode('||', $field_value) : $field_value;
@@ -157,7 +157,7 @@ 
                     if (strlen($itemvalue) == 0) {
                         $itemvalue = $item;
                     }
-                    $field_html .= '<input type="radio" value="' . $modx->htmlspecialchars($itemvalue) . '" id="tv_' . $i . '" name="tv' . $field_id . '" ' . ($itemvalue == $field_value ? 'checked="checked"' : '') . ' onchange="documentDirty=true;" /><label for="tv_' . $i . '" class="radio">' . $item . '</label><br />';
+                    $field_html .= '<input type="radio" value="'.$modx->htmlspecialchars($itemvalue).'" id="tv_'.$i.'" name="tv'.$field_id.'" '.($itemvalue == $field_value ? 'checked="checked"' : '').' onchange="documentDirty=true;" /><label for="tv_'.$i.'" class="radio">'.$item.'</label><br />';
                     $i++;
                 }
                 break;
@@ -187,13 +187,13 @@ 
 									lastImageCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=images', w, h);
+									OpenServerBrowser('" . MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=images', w, h);
 								}
 								function BrowseFileServer(ctrl) {
 									lastFileCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=files', w, h);
+									OpenServerBrowser('".MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=files', w, h);
 								}
 								function SetUrlChange(el) {
 									if ('createEvent' in document) {
@@ -227,7 +227,7 @@ 
 						</script>";
                     $ResourceManagerLoaded = true;
                 }
-                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseServer(\'tv' . $field_id . '\')" />';
+                $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'"  value="'.$field_value.'" '.$field_style.' onchange="documentDirty=true;" /><input type="button" value="'.$_lang['insert'].'" onclick="BrowseServer(\'tv'.$field_id.'\')" />';
                 break;
             case "file": // handles the input of file uploads
                 /* Modified by Timon for use with resource browser */
@@ -257,13 +257,13 @@ 
 									lastImageCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=images', w, h);
+									OpenServerBrowser('" . MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=images', w, h);
 								}
 								function BrowseFileServer(ctrl) {
 									lastFileCtrl = ctrl;
 									var w = screen.width * 0.5;
 									var h = screen.height * 0.5;
-									OpenServerBrowser('" . MODX_MANAGER_URL . "media/browser/{$which_browser}/browser.php?Type=files', w, h);
+									OpenServerBrowser('".MODX_MANAGER_URL."media/browser/{$which_browser}/browser.php?Type=files', w, h);
 								}
 								function SetUrlChange(el) {
 									if ('createEvent' in document) {
@@ -297,7 +297,7 @@ 
 						</script>";
                     $ResourceManagerLoaded = true;
                 }
-                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '"  value="' . $field_value . '" ' . $field_style . ' onchange="documentDirty=true;" /><input type="button" value="' . $_lang['insert'] . '" onclick="BrowseFileServer(\'tv' . $field_id . '\')" />';
+                $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'"  value="'.$field_value.'" '.$field_style.' onchange="documentDirty=true;" /><input type="button" value="'.$_lang['insert'].'" onclick="BrowseFileServer(\'tv'.$field_id.'\')" />';
 
                 break;
 
@@ -305,16 +305,16 @@ 
                 $custom_output = '';
                 /* If we are loading a file */
                 if (substr($field_elements, 0, 5) == "@FILE") {
-                    $file_name = MODX_BASE_PATH . trim(substr($field_elements, 6));
+                    $file_name = MODX_BASE_PATH.trim(substr($field_elements, 6));
                     if (!file_exists($file_name)) {
-                        $custom_output = $file_name . ' does not exist';
+                        $custom_output = $file_name.' does not exist';
                     } else {
                         $custom_output = file_get_contents($file_name);
                     }
                 } elseif (substr($field_elements, 0, 8) == '@INCLUDE') {
-                    $file_name = MODX_BASE_PATH . trim(substr($field_elements, 9));
+                    $file_name = MODX_BASE_PATH.trim(substr($field_elements, 9));
                     if (!file_exists($file_name)) {
-                        $custom_output = $file_name . ' does not exist';
+                        $custom_output = $file_name.' does not exist';
                     } else {
                         ob_start();
                         include $file_name;
@@ -325,7 +325,7 @@ 
                     $chunk_name = trim(substr($field_elements, 7));
                     $chunk_body = $modx->getChunk($chunk_name);
                     if ($chunk_body == false) {
-                        $custom_output = $_lang['chunk_no_exist'] . '(' . $_lang['htmlsnippet_name'] . ':' . $chunk_name . ')';
+                        $custom_output = $_lang['chunk_no_exist'].'('.$_lang['htmlsnippet_name'].':'.$chunk_name.')';
                     } else {
                         $custom_output = $chunk_body;
                     }
@@ -350,15 +350,15 @@ 
                 break;
 
             default: // the default handler -- for errors, mostly
-                $field_html .= '<input type="text" id="tv' . $field_id . '" name="tv' . $field_id . '" value="' . $modx->htmlspecialchars($field_value) . '" ' . $field_style . ' onchange="documentDirty=true;" />';
+                $field_html .= '<input type="text" id="tv'.$field_id.'" name="tv'.$field_id.'" value="'.$modx->htmlspecialchars($field_value).'" '.$field_style.' onchange="documentDirty=true;" />';
 
         } // end switch statement
     } else {
         $custom = explode(":", $field_type);
         $custom_output = '';
-        $file_name = MODX_BASE_PATH . 'assets/tvs/' . $custom['1'] . '/' . $custom['1'] . '.customtv.php';
+        $file_name = MODX_BASE_PATH.'assets/tvs/'.$custom['1'].'/'.$custom['1'].'.customtv.php';
         if (!file_exists($file_name)) {
-            $custom_output = $file_name . ' does not exist';
+            $custom_output = $file_name.' does not exist';
         } else {
             ob_start();
             include $file_name;

manager/media/browser/mcpuk/core/browser.php

Doc Comments +9 added lines

@@ -783,6 +783,9 @@ 
         }
     }
 
+    /**
+     * @param string $dir
+     */
     protected function moveUploadFile($file, $dir)
     {
         $message = $this->checkUploadedFile($file);
@@ -817,6 +820,9 @@ 
         return "/" . basename($target);
     }
 
+    /**
+     * @param string $file
+     */
     protected function sendDefaultThumb($file=null)
     {
         if ($file !== null) {
@@ -1028,6 +1034,9 @@ 
         return "";
     }
 
+    /**
+     * @param string $message
+     */
     protected function errorMsg($message, array $data=null)
     {
         if (in_array($this->action, array("thumb", "upload", "download", "downloadDir"))) {

Indentation +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Browser actions class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Browser actions class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class browser extends uploader
 {

Spacing +52 added lines, -52 removed lines

@@ -38,7 +38,7 @@ 
             $this->get['dir'] = $dir;
         }
 
-        $thumbsDir = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'];
+        $thumbsDir = $this->config['uploadDir']."/".$this->config['thumbsDir'];
         if ((
                 !is_dir($thumbsDir) &&
                 !@mkdir($thumbsDir, $this->config['dirPerms'])
@@ -108,7 +108,7 @@ 
             $this->session['dir'] = $this->type;
         } else {
             $type = $this->getTypeFromPath($this->session['dir']);
-            $dir = $this->config['uploadDir'] . "/" . $this->session['dir'];
+            $dir = $this->config['uploadDir']."/".$this->session['dir'];
             if (($type != $this->type) || !is_dir($dir) || !is_readable($dir)) {
                 $this->session['dir'] = $this->type;
             }
@@ -172,7 +172,7 @@ 
         }
         $file = "{$this->thumbsDir}/{$this->type}/{$this->get['dir']}/$file";
         if (!is_file($file) || !is_readable($file)) {
-            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/" . basename($file);
+            $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/".basename($file);
             if (!is_file($file) || !is_readable($file)) {
                 $this->sendDefaultThumb($file);
             }
@@ -205,7 +205,7 @@ 
     protected function act_chDir()
     {
         $this->postDir(); // Just for existing check
-        $this->session['dir'] = $this->type . "/" . $this->post['dir'];
+        $this->session['dir'] = $this->type."/".$this->post['dir'];
         $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}");
         return json_encode(array(
             'files' => $this->getFiles($this->session['dir']),
@@ -262,12 +262,12 @@ 
         if (substr($newName, 0, 1) == ".") {
             $this->errorMsg("Folder name shouldn't begins with '.'");
         }
-        if (!@rename($dir, dirname($dir) . "/$newName")) {
+        if (!@rename($dir, dirname($dir)."/$newName")) {
             $this->errorMsg("Cannot rename the folder.");
         }
         $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}";
         if (is_dir($thumbDir)) {
-            @rename($thumbDir, dirname($thumbDir) . "/$newName");
+            @rename($thumbDir, dirname($thumbDir)."/$newName");
         }
         return json_encode(array('name' => $newName));
     }
@@ -332,7 +332,7 @@ 
         $dir = $this->postDir();
         if (!isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'], '../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file)
         ) {
@@ -344,9 +344,9 @@ 
         header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
         header("Cache-Control: private", false);
         header("Content-Type: application/octet-stream");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $this->post['file']) . '"');
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $this->post['file']).'"');
         header("Content-Transfer-Encoding:­ binary");
-        header("Content-Length: " . filesize($file));
+        header("Content-Length: ".filesize($file));
         readfile($file);
         die;
     }
@@ -357,7 +357,7 @@ 
         if (!$this->config['access']['files']['rename'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'], '../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             !isset($this->post['newName']) ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file)
@@ -400,7 +400,7 @@ 
         $thumbFile = "$thumbDir/{$this->post['file']}";
 
         if (file_exists($thumbFile)) {
-            @rename($thumbFile, "$thumbDir/" . basename($newName));
+            @rename($thumbFile, "$thumbDir/".basename($newName));
         }
         return true;
     }
@@ -411,7 +411,7 @@ 
         if (!$this->config['access']['files']['delete'] ||
             !isset($this->post['dir']) ||
             !isset($this->post['file']) ||
-            strpos($this->post['file'], '../')!==false ||
+            strpos($this->post['file'], '../') !== false ||
             (false === ($file = "$dir/{$this->post['file']}")) ||
             !file_exists($file) || !is_readable($file) || !file::isWritable($file) ||
             !@unlink($file)
@@ -456,11 +456,11 @@ 
             if (!file_exists($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             } elseif (substr($base, 0, 1) == ".") {
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             } elseif (!$this->validateExtension($ext, $type)) {
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             } elseif (file_exists("$dir/$base")) {
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             } elseif (!is_readable($path) || !is_file($path)) {
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             } elseif (!@copy($path, "$dir/$base")) {
@@ -516,11 +516,11 @@ 
             if (!file_exists($path)) {
                 $error[] = $this->label("The file '{file}' does not exist.", $replace);
             } elseif (substr($base, 0, 1) == ".") {
-                $error[] = "$base: " . $this->label("File name shouldn't begins with '.'");
+                $error[] = "$base: ".$this->label("File name shouldn't begins with '.'");
             } elseif (!$this->validateExtension($ext, $type)) {
-                $error[] = "$base: " . $this->label("Denied file extension.");
+                $error[] = "$base: ".$this->label("Denied file extension.");
             } elseif (file_exists("$dir/$base")) {
-                $error[] = "$base: " . $this->label("A file or folder with that name already exists.");
+                $error[] = "$base: ".$this->label("A file or folder with that name already exists.");
             } elseif (!is_readable($path) || !is_file($path)) {
                 $error[] = $this->label("Cannot read '{file}'.", $replace);
             } elseif (!file::isWritable($path) || !@rename($path, "$dir/$base")) {
@@ -593,15 +593,15 @@ 
         if (!isset($this->post['dir']) || $this->config['denyZipDownload']) {
             $this->errorMsg("Unknown error.");
         }
-        $filename = basename($dir) . ".zip";
+        $filename = basename($dir).".zip";
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
         new zipFolder($file, $dir);
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $filename) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $filename).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -632,7 +632,7 @@ 
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -645,8 +645,8 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="selected_files_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="selected_files_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -672,7 +672,7 @@ 
             if ($type != $this->type) {
                 continue;
             }
-            $file = $this->config['uploadDir'] . "/$file";
+            $file = $this->config['uploadDir']."/$file";
             if (!is_file($file) || !is_readable($file)) {
                 continue;
             }
@@ -680,7 +680,7 @@ 
         }
 
         do {
-            $file = md5(time() . session_id());
+            $file = md5(time().session_id());
             $file = "{$this->config['uploadDir']}/$file.zip";
         } while (file_exists($file));
 
@@ -693,8 +693,8 @@ 
             $zip->close();
         }
         header("Content-Type: application/x-zip");
-        header('Content-Disposition: attachment; filename="clipboard_' . basename($file) . '"');
-        header("Content-Length: " . filesize($file));
+        header('Content-Disposition: attachment; filename="clipboard_'.basename($file).'"');
+        header("Content-Length: ".filesize($file));
         readfile($file);
         unlink($file);
         die;
@@ -746,23 +746,23 @@ 
         } elseif (
             function_exists("curl_init") &&
             (false !== ($curl = @curl_init($url))) &&
-            (@ob_start()                 ||  (@curl_close($curl) && false)) &&
-            (@curl_exec($curl)           ||  (@curl_close($curl) && false)) &&
-            ((false !== ($ver = @ob_get_clean())) ||  (@curl_close($curl) && false)) &&
-            (@curl_close($curl)          ||  true) &&
+            (@ob_start() || (@curl_close($curl) && false)) &&
+            (@curl_exec($curl) || (@curl_close($curl) && false)) &&
+            ((false !== ($ver = @ob_get_clean())) || (@curl_close($curl) && false)) &&
+            (@curl_close($curl) || true) &&
             preg_match($pattern, $ver)
 
         // Socket extension
         ) {
         } elseif (function_exists('socket_create')) {
             $cmd =
-                "GET $path " . strtoupper($protocol) . "/1.1\r\n" .
-                "Host: $host\r\n" .
+                "GET $path ".strtoupper($protocol)."/1.1\r\n".
+                "Host: $host\r\n".
                 "Connection: Close\r\n\r\n";
 
             if ((false !== ($socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) &&
-                (false !==    @socket_connect($socket, $host, $port)) &&
-                (false !==    @socket_write($socket, $cmd, strlen($cmd))) &&
+                (false !== @socket_connect($socket, $host, $port)) &&
+                (false !== @socket_write($socket, $cmd, strlen($cmd))) &&
                 (false !== ($ver = @socket_read($socket, 2048))) &&
                 preg_match($responsePattern, $ver, $match)
             ) {
@@ -795,14 +795,14 @@ 
         }
 
         $filename = $this->normalizeFilename($file['name']);
-        $target = "$dir/" . file::getInexistantFilename($filename, $dir);
+        $target = "$dir/".file::getInexistantFilename($filename, $dir);
 
         if (!@move_uploaded_file($file['tmp_name'], $target) &&
             !@rename($file['tmp_name'], $target) &&
             !@copy($file['tmp_name'], $target)
         ) {
             @unlink($file['tmp_name']);
-            return "{$file['name']}: " . $this->label("Cannot move uploaded file to target folder.");
+            return "{$file['name']}: ".$this->label("Cannot move uploaded file to target folder.");
         } elseif (function_exists('chmod')) {
             chmod($target, $this->config['filePerms']);
         }
@@ -814,10 +814,10 @@ 
 
         $this->makeThumb($target);
 
-        return "/" . basename($target);
+        return "/".basename($target);
     }
 
-    protected function sendDefaultThumb($file=null)
+    protected function sendDefaultThumb($file = null)
     {
         if ($file !== null) {
             $ext = file::getExtension($file);
@@ -844,10 +844,10 @@ 
         foreach ($files as $file) {
             $ext = file::getExtension($file);
             $smallThumb = false;
-            if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' ))) {
+            if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg'))) {
                 $size = @getimagesize($file);
                 if (is_array($size) && count($size)) {
-                    $thumb_file = "$thumbDir/" . basename($file);
+                    $thumb_file = "$thumbDir/".basename($file);
                     if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file)) {
                         $this->makeThumb($file);
                     }
@@ -863,7 +863,7 @@ 
             }
             $name = basename($file);
             $types = $this->config['types'];
-            $types = explode(' ', $types['images'] . ' ' . $types['image']);
+            $types = explode(' ', $types['images'].' '.$types['image']);
             if (substr($name, 0, 1) == '.' && !$this->config['showHiddenFiles']) {
                 continue;
             }
@@ -889,7 +889,7 @@ 
         return $return;
     }
 
-    protected function getTree($dir, $index=0)
+    protected function getTree($dir, $index = 0)
     {
         $path = explode("/", $dir);
 
@@ -927,11 +927,11 @@ 
         return $dirs;
     }
 
-    protected function postDir($existent=true)
+    protected function postDir($existent = true)
     {
         $dir = $this->typeDir;
         if (isset($this->post['dir'])) {
-            $dir .= "/" . $this->post['dir'];
+            $dir .= "/".$this->post['dir'];
         }
         if ($existent && (!is_dir($dir) || !is_readable($dir))) {
             $this->errorMsg("Inexistant or inaccessible folder.");
@@ -939,11 +939,11 @@ 
         return $dir;
     }
 
-    protected function getDir($existent=true)
+    protected function getDir($existent = true)
     {
         $dir = $this->typeDir;
         if (isset($this->get['dir'])) {
-            $dir .= "/" . $this->get['dir'];
+            $dir .= "/".$this->get['dir'];
         }
         if ($existent && (!is_dir($dir) || !is_readable($dir))) {
             $this->errorMsg("Inexistant or inaccessible folder.");
@@ -969,7 +969,7 @@ 
         return $return;
     }
 
-    protected function getDirInfo($dir, $removable=false)
+    protected function getDirInfo($dir, $removable = false)
     {
         if ((substr(basename($dir), 0, 1) == ".") || !is_dir($dir) || !is_readable($dir)) {
             return false;
@@ -1002,7 +1002,7 @@ 
         return $info;
     }
 
-    protected function output($data=null, $template=null)
+    protected function output($data = null, $template = null)
     {
         if (!is_array($data)) {
             $data = array();
@@ -1028,7 +1028,7 @@ 
         return "";
     }
 
-    protected function errorMsg($message, array $data=null)
+    protected function errorMsg($message, array $data = null)
     {
         if (in_array($this->action, array("thumb", "upload", "download", "downloadDir"))) {
             die($this->label($message, $data));

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -756,7 +756,7 @@
         ) {
         } elseif (function_exists('socket_create')) {
             $cmd =
-                "GET $path " . strtoupper($protocol) . "/1.1\r\n" .
+                "get $path " . strtoupper($protocol) . "/1.1\r\n" .
                 "Host: $host\r\n" .
                 "Connection: Close\r\n\r\n";
 

manager/media/browser/mcpuk/core/uploader.php

Doc Comments +18 added lines

@@ -427,6 +427,9 @@ 
     }
 
 
+    /**
+     * @return string
+     */
     protected function normalizeFilename($filename)
     {
         if ($this->getTransaliasSettings()) {
@@ -437,6 +440,9 @@ 
         return $filename;
     }
 
+    /**
+     * @param string $dirname
+     */
     protected function normalizeDirname($dirname)
     {
         return $this->modx->stripAlias($dirname);
@@ -566,6 +572,9 @@ 
         return (is_dir($path) && is_readable($path)) ? $return : false;
     }
 
+    /**
+     * @param string $ext
+     */
     protected function validateExtension($ext, $type)
     {
         $ext = trim(strtolower($ext));
@@ -595,12 +604,18 @@ 
         return in_array($ext, $exts);
     }
 
+    /**
+     * @return string
+     */
     protected function getTypeFromPath($path)
     {
         return preg_match('/^([^\/]*)\/.*$/', $path, $patt)
             ? $patt[1] : $path;
     }
 
+    /**
+     * @param string $path
+     */
     protected function removeTypeFromPath($path)
     {
         return preg_match('/^[^\/]*\/(.*)$/', $path, $patt)
@@ -811,6 +826,9 @@ 
         die;
     }
 
+    /**
+     * @param string $url
+     */
     protected function callBack($url, $message="")
     {
         $message = text::jsValue($message);

Indentation +36 added lines, -36 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 
 /** This file is part of KCFinder project
-  *
-  *      @desc Uploader class
-  *   @package KCFinder
-  *   @version 2.54
-  *    @author Pavel Tzonkov <sunhater@sunhater.com>
-  * @copyright 2010-2014 KCFinder Project
-  *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
-  *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
-  *      @link http://kcfinder.sunhater.com
-  */
+ *
+ *      @desc Uploader class
+ *   @package KCFinder
+ *   @version 2.54
+ *    @author Pavel Tzonkov <sunhater@sunhater.com>
+ * @copyright 2010-2014 KCFinder Project
+ *   @license http://www.opensource.org/licenses/gpl-2.0.php GPLv2
+ *   @license http://www.opensource.org/licenses/lgpl-2.1.php LGPLv2
+ *      @link http://kcfinder.sunhater.com
+ */
 
 class uploader
 {
@@ -19,92 +19,92 @@ 
     const VERSION = "2.54";
 
     /** Config session-overrided settings
-      * @var array */
+     * @var array */
     protected $config = array();
 
     /** Default image driver
-      * @var string */
+     * @var string */
     protected $imageDriver = "gd";
 
     /** Opener applocation properties
-      *   $opener['name']                 Got from $_GET['opener'];
-      *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
-      *   $opener['TinyMCE']              Boolean
-      * @var array */
+     *   $opener['name']                 Got from $_GET['opener'];
+     *   $opener['CKEditor']['funcNum']  CKEditor function number (got from $_GET)
+     *   $opener['TinyMCE']              Boolean
+     * @var array */
     protected $opener = array();
 
     /** Got from $_GET['type'] or first one $config['types'] array key, if inexistant
-      * @var string */
+     * @var string */
     protected $type;
 
     /** Helper property. Local filesystem path to the Type Directory
-      * Equivalent: $config['uploadDir'] . "/" . $type
-      * @var string */
+     * Equivalent: $config['uploadDir'] . "/" . $type
+     * @var string */
     protected $typeDir;
 
     /** Helper property. Web URL to the Type Directory
-      * Equivalent: $config['uploadURL'] . "/" . $type
-      * @var string */
+     * Equivalent: $config['uploadURL'] . "/" . $type
+     * @var string */
     protected $typeURL;
 
     /** Linked to $config['types']
-      * @var array */
+     * @var array */
     protected $types = array();
 
     /** Settings which can override default settings if exists as keys in $config['types'][$type] array
-      * @var array */
+     * @var array */
     protected $typeSettings = array('disabled', 'theme', 'dirPerms', 'filePerms', 'denyZipDownload', 'maxImageWidth', 'maxImageHeight', 'thumbWidth', 'thumbHeight', 'jpegQuality', 'access', 'filenameChangeChars', 'dirnameChangeChars', 'denyExtensionRename', 'deniedExts', 'watermark');
 
     /** Got from language file
-      * @var string */
+     * @var string */
     protected $charset;
 
     /** The language got from $_GET['lng'] or $_GET['lang'] or... Please see next property
-      * @var string */
+     * @var string */
     protected $lang = 'en';
 
     /** Possible language $_GET keys
-      * @var array */
+     * @var array */
     protected $langInputNames = array('lang', 'langCode', 'lng', 'language', 'lang_code');
 
     /** Uploaded file(s) info. Linked to first $_FILES element
-      * @var array */
+     * @var array */
     protected $file;
 
     /** Next three properties are got from the current language file
-      * @var string */
+     * @var string */
     protected $dateTimeFull;   // Currently not used
     protected $dateTimeMid;    // Currently not used
     protected $dateTimeSmall;
 
     /** Contain Specified language labels
-      * @var array */
+     * @var array */
     protected $labels = array();
 
     /** Contain unprocessed $_GET array. Please use this instead of $_GET
-      * @var array */
+     * @var array */
     protected $get;
 
     /** Contain unprocessed $_POST array. Please use this instead of $_POST
-      * @var array */
+     * @var array */
     protected $post;
 
     /** Contain unprocessed $_COOKIE array. Please use this instead of $_COOKIE
-      * @var array */
+     * @var array */
     protected $cookie;
 
     /** Session array. Please use this property instead of $_SESSION
-      * @var array */
+     * @var array */
     protected $session;
 
     /** CMS integration attribute (got from $_GET['cms'])
-      * @var string */
+     * @var string */
     protected $cms = "";
 
     protected $modx = null;
     /** Magic method which allows read-only access to protected or private class properties
-      * @param string $property
-      * @return mixed */
+     * @param string $property
+     * @return mixed */
     public function __get($property)
     {
         return property_exists($this, $property) ? $this->$property : null;

Spacing +26 added lines, -27 removed lines

@@ -73,8 +73,8 @@ 
 
     /** Next three properties are got from the current language file
       * @var string */
-    protected $dateTimeFull;   // Currently not used
-    protected $dateTimeMid;    // Currently not used
+    protected $dateTimeFull; // Currently not used
+    protected $dateTimeMid; // Currently not used
     protected $dateTimeSmall;
 
     /** Contain Specified language labels
@@ -227,7 +227,7 @@ 
 
         // COOKIES INIT
         $ip = '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)';
-        $ip = '/^' . implode('\.', array($ip, $ip, $ip, $ip)) . '$/';
+        $ip = '/^'.implode('\.', array($ip, $ip, $ip, $ip)).'$/';
         if (preg_match($ip, $_SERVER['HTTP_HOST']) ||
             preg_match('/^[^\.]+$/', $_SERVER['HTTP_HOST'])
         ) {
@@ -247,7 +247,7 @@ 
         ) {
             list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
             $path = path::normalize($path);
-            $this->config['uploadURL'] = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/$path";
+            $this->config['uploadURL'] = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/$path";
             $this->config['uploadDir'] = strlen($this->config['uploadDir'])
                 ? path::normalize($this->config['uploadDir'])
                 : path::url2fullPath("/$path");
@@ -293,7 +293,7 @@ 
         foreach ($this->langInputNames as $key) {
             if (isset($this->get[$key]) &&
                 preg_match('/^[a-z][a-z\._\-]*$/i', $this->get[$key]) &&
-                file_exists("lang/" . strtolower($this->get[$key]) . ".php")
+                file_exists("lang/".strtolower($this->get[$key]).".php")
             ) {
                 $this->lang = $this->get[$key];
                 break;
@@ -364,7 +364,7 @@ 
                 }
 
                 $filename = $this->normalizeFilename($file['name']);
-                $target = file::getInexistantFilename($dir . $filename);
+                $target = file::getInexistantFilename($dir.$filename);
 
                 if (!@move_uploaded_file($file['tmp_name'], $target) &&
                     !@rename($file['tmp_name'], $target) &&
@@ -380,11 +380,11 @@ 
                     if (isset($udir)) {
                         $url .= "/$udir";
                     }
-                    $url .= "/" . basename($target);
+                    $url .= "/".basename($target);
                     if (preg_match('/^([a-z]+)\:\/\/([^\/^\:]+)(\:(\d+))?\/(.+)$/', $url, $patt)) {
                         list($unused, $protocol, $domain, $unused, $port, $path) = $patt;
-                        $base = "$protocol://$domain" . (strlen($port) ? ":$port" : "") . "/";
-                        $url = $base . path::urlPathEncode($path);
+                        $base = "$protocol://$domain".(strlen($port) ? ":$port" : "")."/";
+                        $url = $base.path::urlPathEncode($path);
                     } else {
                         $url = path::urlPathEncode($url);
                     }
@@ -412,7 +412,7 @@ 
 
         // Cleaning uploaded filename?
         $setting = $modx->db->select('count(*)', $modx->getFullTableName('system_settings'), 'setting_name="clean_uploaded_filename" AND setting_value=1');
-        if ($modx->db->getValue($setting)>0) {
+        if ($modx->db->getValue($setting) > 0) {
             // Transalias plugin active?
             $res = $modx->db->select('properties', $modx->getFullTableName('site_plugins'), 'name="TransAlias" AND disabled=0');
             if ($properties = $modx->db->getValue($res)) {
@@ -432,7 +432,7 @@ 
         if ($this->getTransaliasSettings()) {
             $format = strrchr($filename, ".");
             $filename = str_replace($format, "", $filename);
-            $filename = $this->modx->stripAlias($filename) . $format;
+            $filename = $this->modx->stripAlias($filename).$format;
         }
         return $filename;
     }
@@ -442,7 +442,7 @@ 
         return $this->modx->stripAlias($dirname);
     }
 
-    protected function checkUploadedFile(array $aFile=null)
+    protected function checkUploadedFile(array $aFile = null)
     {
         $config = &$this->config;
         $file = ($aFile === null) ? $this->file : $aFile;
@@ -484,8 +484,7 @@ 
                 ($file['error'] == UPLOAD_ERR_NO_TMP_DIR) ?
                     $this->label("Missing a temporary folder.") : (
                 ($file['error'] == UPLOAD_ERR_CANT_WRITE) ?
-                    $this->label("Failed to write file.") :
-                    $this->label("Unknown error.")
+                    $this->label("Failed to write file.") : $this->label("Unknown error.")
             )))));
         }
 
@@ -527,15 +526,15 @@ 
 
 
         // CHECK FOR MODX MAX FILE SIZE
-        $actualfilesize=filesize($file['tmp_name']);
+        $actualfilesize = filesize($file['tmp_name']);
         if (isset($this->config['maxfilesize']) && $actualfilesize > $this->config['maxfilesize']) {
-            return $this->label("File is too big: " . $actualfilesize . " Bytes. (max " . $this->config['maxfilesize'] . " Bytes)");
+            return $this->label("File is too big: ".$actualfilesize." Bytes. (max ".$this->config['maxfilesize']." Bytes)");
         }
 
         return true;
     }
 
-    protected function checkInputDir($dir, $inclType=true, $existing=true)
+    protected function checkInputDir($dir, $inclType = true, $existing = true)
     {
         $dir = path::normalize($dir);
         if (substr($dir, 0, 1) == "/") {
@@ -607,7 +606,7 @@ 
             ? $patt[1] : "";
     }
 
-    protected function imageResize($image, $file=null)
+    protected function imageResize($image, $file = null)
     {
         if (!($image instanceof image)) {
             $img = image::factory($this->imageDriver, $image);
@@ -702,7 +701,7 @@ 
             $img->watermark($this->config['watermark']['file'], $left, $top);
         }
 
-        $options = array( 'file' => $file );
+        $options = array('file' => $file);
 
         $type = exif_imagetype($file);
 
@@ -714,11 +713,11 @@ 
                 return $img->output('png', $options);
 
             default:
-                return $img->output('jpeg', array_merge($options, array( 'quality' => $this->config['jpegQuality'] )));
+                return $img->output('jpeg', array_merge($options, array('quality' => $this->config['jpegQuality'])));
         }
     }
 
-    protected function makeThumb($file, $overwrite=true)
+    protected function makeThumb($file, $overwrite = true)
     {
         $img = image::factory($this->imageDriver, $file);
 
@@ -728,7 +727,7 @@ 
         }
 
         $thumb = substr($file, strlen($this->config['uploadDir']));
-        $thumb = $this->config['uploadDir'] . "/" . $this->config['thumbsDir'] . "/" . $thumb;
+        $thumb = $this->config['uploadDir']."/".$this->config['thumbsDir']."/".$thumb;
         $thumb = path::normalize($thumb);
         $thumbDir = dirname($thumb);
         if (!is_dir($thumbDir) && !@mkdir($thumbDir, $this->config['dirPerms'], true)) {
@@ -757,8 +756,8 @@ 
         if ($this->imageDriver == 'gd') {
             $width  = imagesx($img->image);
             $height = imagesy($img->image);
-            $back   = image::factory($this->imageDriver, array( $width, $height ));
-            $tile   = image::factory($this->imageDriver, __DIR__ . '/../themes/' . $this->config['theme'] . '/img/bg_transparent.png');
+            $back   = image::factory($this->imageDriver, array($width, $height));
+            $tile   = image::factory($this->imageDriver, __DIR__.'/../themes/'.$this->config['theme'].'/img/bg_transparent.png');
 
             imagesettile($back->image, $tile->image);
             imagefilledrectangle($back->image, 0, 0, $width, $height, IMG_COLOR_TILED);
@@ -790,7 +789,7 @@ 
         $this->labels = $lang;
     }
 
-    protected function label($string, array $data=null)
+    protected function label($string, array $data = null)
     {
         $return = isset($this->labels[$string]) ? $this->labels[$string] : $string;
         if (is_array($data)) {
@@ -801,7 +800,7 @@ 
         return $return;
     }
 
-    protected function backMsg($message, array $data=null)
+    protected function backMsg($message, array $data = null)
     {
         $message = $this->label($message, $data);
         if (isset($this->file['tmp_name']) && file_exists($this->file['tmp_name'])) {
@@ -811,7 +810,7 @@ 
         die;
     }
 
-    protected function callBack($url, $message="")
+    protected function callBack($url, $message = "")
     {
         $message = text::jsValue($message);
         $CKfuncNum = isset($this->opener['CKEditor']['funcNum'])

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

Doc Comments +6 added lines

@@ -177,6 +177,9 @@ 
     }
 
 
+    /**
+     * @param integer $n
+     */
     private function getChars($n)
     {
         $response = null;
@@ -214,6 +217,9 @@ 
     }
 
 
+    /**
+     * @param false|string $str
+     */
     private function readInt($str)
     {
         $size = unpack("C*", $str);

Spacing +3 added lines, -3 removed lines

@@ -67,9 +67,9 @@ 
                     return $this->type = 'bmp';
                 case "GI":
                     return $this->type = 'gif';
-                case chr(0xFF) . chr(0xd8):
+                case chr(0xFF).chr(0xd8):
                     return $this->type = 'jpeg';
-                case chr(0x89) . 'P':
+                case chr(0x89).'P':
                     return $this->type = 'png';
                 default:
                     return false;
@@ -182,7 +182,7 @@ 
         $response = null;
 
         // do we need more data?
-        if ($this->strpos + $n -1 >= strlen($this->str)) {
+        if ($this->strpos + $n - 1 >= strlen($this->str)) {
             $end = ($this->strpos + $n);
 
             while (strlen($this->str) < $end && $response !== false) {