evolution-cms / evolution

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

Unused Use Statements +1 added lines, -1 removed lines

@@ -8,8 +8,8 @@
  *******************************************************
  */
 
-use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception as PHPMailerException;
+use PHPMailer\PHPMailer\PHPMailer;
 
 require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php';
 require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php';

manager/actions/logging.static.php

Braces +36 added lines, -36 removed lines

@@ -1,22 +1,22 @@ 
 <?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('logs')) {

+if (!$modx->hasPermission('logs')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 

-function array_unique_multi($array, $checkKey)

-{

+function array_unique_multi($array, $checkKey)
+{
     // Use the builtin if we're not a multi-dimensional array

-    if (!is_array(current($array)) || empty($checkKey)) {

+    if (!is_array(current($array)) || empty($checkKey)) {
         return array_unique($array);

     }

 

     $ret = array();

     $checkValues = array(); // contains the unique key Values

-    foreach ($array as $key => $current) {

-        if (in_array($current[$checkKey], $checkValues)) {

+    foreach ($array as $key => $current) {
+        if (in_array($current[$checkKey], $checkValues)) {
             continue;

         } // duplicate

 

@@ -26,17 +26,17 @@ 
     return $ret;

 }

 

-function record_sort($array, $key)

-{

+function record_sort($array, $key)
+{
     $hash = array();

-    foreach ($array as $k => $v) {

+    foreach ($array as $k => $v) {
         $hash[$k] = $v[$key];

     }

 

     natsort($hash);

 

     $records = array();

-    foreach ($hash as $k => $row) {

+    foreach ($hash as $k => $row) {
         $records[$k] = $array[$k];

     }

 

@@ -63,7 +63,7 @@ 
                             <?php

                             // get all users currently in the log

                             $logs_user = record_sort(array_unique_multi($logs, 'internalKey'), 'username');

-                            foreach ($logs_user as $row) {

+                            foreach ($logs_user as $row) {
                                 $selectedtext = $row['internalKey'] == $_REQUEST['searchuser'] ? ' selected="selected"' : '';

                                 echo "\t\t" . '<option value="' . $row['internalKey'] . '"' . $selectedtext . '>' . $row['username'] . "</option>\n";

                             }

@@ -80,9 +80,9 @@ 
                             // get all available actions in the log

                             include_once "actionlist.inc.php";

                             $logs_actions = record_sort(array_unique_multi($logs, 'action'), 'action');

-                            foreach ($logs_actions as $row) {

+                            foreach ($logs_actions as $row) {
                                 $action = getAction($row['action']);

-                                if ($action == 'Idle') {

+                                if ($action == 'Idle') {
                                     continue;

                                 }

                                 $selectedtext = $row['action'] == $_REQUEST['action'] ? ' selected="selected"' : '';

@@ -100,7 +100,7 @@ 
                             <?php

                             // get all itemid currently in logging

                             $logs_items = record_sort(array_unique_multi($logs, 'itemid'), 'itemid');

-                            foreach ($logs_items as $row) {

+                            foreach ($logs_items as $row) {
                                 $selectedtext = $row['itemid'] == $_REQUEST['itemid'] ? ' selected="selected"' : '';

                                 echo "\t\t" . '<option value="' . $row['itemid'] . '"' . $selectedtext . '>' . $row['itemid'] . "</option>\n";

                             }

@@ -116,7 +116,7 @@ 
                             <?php

                             // get all itemname currently in logging

                             $logs_names = record_sort(array_unique_multi($logs, 'itemname'), 'itemname');

-                            foreach ($logs_names as $row) {

+                            foreach ($logs_names as $row) {
                                 $selectedtext = $row['itemname'] == $_REQUEST['itemname'] ? ' selected="selected"' : '';

                                 echo "\t\t" . '<option value="' . $row['itemname'] . '"' . $selectedtext . '>' . $row['itemname'] . "</option>\n";

                             }

@@ -172,36 +172,36 @@ 
     <div class="container container-body">

 

 <?php

-if (isset($_REQUEST['log_submit'])) {

+if (isset($_REQUEST['log_submit'])) {
     // get the selections the user made.

     $sqladd = array();

-    if ($_REQUEST['searchuser'] != 0) {

+    if ($_REQUEST['searchuser'] != 0) {
         $sqladd[] = "internalKey='" . (int)$_REQUEST['searchuser'] . "'";

     }

-    if ($_REQUEST['action'] != 0) {

+    if ($_REQUEST['action'] != 0) {
         $sqladd[] = "action=" . (int)$_REQUEST['action'];

     }

-    if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {

+    if ($_REQUEST['itemid'] != 0 || $_REQUEST['itemid'] == "-") {
         $sqladd[] = "itemid='" . $_REQUEST['itemid'] . "'";

     }

-    if ($_REQUEST['itemname'] != '0') {

+    if ($_REQUEST['itemname'] != '0') {
         $sqladd[] = "itemname='" . $modx->db->escape($_REQUEST['itemname']) . "'";

     }

-    if ($_REQUEST['message'] != "") {

+    if ($_REQUEST['message'] != "") {
         $sqladd[] = "message LIKE '%" . $modx->db->escape($_REQUEST['message']) . "%'";

     }

     // date stuff

-    if ($_REQUEST['datefrom'] != "") {

+    if ($_REQUEST['datefrom'] != "") {
         $sqladd[] = "timestamp>" . $modx->toTimeStamp($_REQUEST['datefrom']);

     }

-    if ($_REQUEST['dateto'] != "") {

+    if ($_REQUEST['dateto'] != "") {
         $sqladd[] = "timestamp<" . $modx->toTimeStamp($_REQUEST['dateto']);

     }

 

     // If current position is not set, set it to zero

-    if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {

+    if (!isset($_REQUEST['int_cur_position']) || $_REQUEST['int_cur_position'] == 0) {
         $int_cur_position = 0;

-    } else {

+    } else {
         $int_cur_position = $_REQUEST['int_cur_position'];

     }

 

@@ -215,9 +215,9 @@ 
 

     $rs = $modx->db->select('*', $modx->getFullTableName('manager_log'), (!empty($sqladd) ? implode(' AND ', $sqladd) : ''), 'timestamp DESC, id DESC', "{$int_cur_position}, {$int_num_result}");

 

-if ($limit < 1) {

+if ($limit < 1) {
     echo '<p>' . $_lang["mgrlog_emptysrch"] . '</p>';

-} else {

+} else {
     echo '<p>' . $_lang["mgrlog_sortinst"] . '</p>';

 

     include_once "paginate.inc.php";

@@ -236,14 +236,14 @@ 
     $paging = $array_paging['first_link'] . $_lang["paging_first"] . (isset($array_paging['first_link']) ? "</a> " : " ");

     $paging .= $array_paging['previous_link'] . $_lang["paging_prev"] . (isset($array_paging['previous_link']) ? "</a> " : " ");

     $pagesfound = sizeof($array_row_paging);

-    if ($pagesfound > 6) {

+    if ($pagesfound > 6) {
         $paging .= $array_row_paging[$current_row - 2]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row - 1]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row + 1]; // ."&nbsp;";

         $paging .= $array_row_paging[$current_row + 2]; // ."&nbsp;";

-    } else {

-        for ($i = 0; $i < $pagesfound; $i++) {

+    } else {
+        for ($i = 0; $i < $pagesfound; $i++) {
             $paging .= $array_row_paging[$i] . "&nbsp;";

         }

     }

@@ -278,12 +278,12 @@ 
                 // grab the entire log file...

                 $logentries = array();

                 $i = 0;

-                while ($logentry = $modx->db->getRow($rs)) {

-                    if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {

+                while ($logentry = $modx->db->getRow($rs)) {
+                    if (!preg_match("/^[0-9]+$/", $logentry['itemid'])) {
                         $item = '<div style="text-align:center;">-</div>';

-                    } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {

+                    } elseif ($logentry['action'] == 3 || $logentry['action'] == 27 || $logentry['action'] == 5) {
                         $item = '<a href="index.php?a=3&amp;id=' . $logentry['itemid'] . '">' . $logentry['itemname'] . '</a>';

-                    } else {

+                    } else {
                         $item = $logentry['itemname'];

                     }

                     //index.php?a=13&searchuser=' . $logentry['internalKey'] . '&action=' . $logentry['action'] . '&itemname=' . $logentry['itemname'] . '&log_submit=true'

@@ -318,6 +318,6 @@ 
     // @see index.php @ 915

     global $action;

     $action = 1;

-} else {

+} else {
     echo $_lang["mgrlog_noquery"];

 }

manager/actions/category_mgr/inc/Categories.php

Braces +11 added lines, -22 removed lines

@@ -18,8 +18,7 @@ 
         $this->db                   = & $modx->db;
         $this->db_tbl['categories'] = $modx->getFullTableName('categories');
 
-        foreach( $this->elements as $element )
-        {
+        foreach( $this->elements as $element ) {
             $this->db_tbl[$element] = $modx->getFullTableName('site_' . $element );
         }
     }
@@ -69,8 +68,7 @@ 
 
     public function getAssignedElements( $category_id, $element )
     {
-        if( in_array( $element, $this->elements, true ) )
-        {
+        if( in_array( $element, $this->elements, true ) ) {
             $elements = $this->db->makeArray(
                 $this->db->select(
                     '*',
@@ -80,11 +78,9 @@ 
             );
 
             // correct the name of templates
-            if( $element === 'templates' )
-            {
+            if( $element === 'templates' ) {
                 $_elements_count = count($elements);
-                for( $i=0; $i < $_elements_count; $i++ )
-                {
+                for( $i=0; $i < $_elements_count; $i++ ) {
                     $elements[$i]['name'] = $elements[$i]['templatename'];
                 }
             }
@@ -96,8 +92,7 @@ 
     public function getAllAssignedElements( $category_id )
     {
         $elements = array();
-        foreach( $this->elements as $element )
-        {
+        foreach( $this->elements as $element ) {
             $elements[$element] = $this->getAssignedElements( $category_id, $element );
         }
         return $elements;
@@ -106,8 +101,7 @@ 
     public function deleteCategory( $category_id )
     {
         $_update = array('category' => 0);
-        foreach( $this->elements as $element )
-        {
+        foreach( $this->elements as $element ) {
             $this->db->update(
                 $_update,
                 $this->db_tbl[$element],
@@ -126,8 +120,7 @@ 
     public function updateCategory( $category_id, $data = array() )
     {
         if( empty( $data )
-            || empty( $category_id ) )
-        {
+            || empty( $category_id ) ) {
             return false;
         }
 
@@ -142,8 +135,7 @@ 
             "`id` = '" . (int)$category_id . "'"
         );
 
-        if( $this->db->getAffectedRows() === 1 )
-        {
+        if( $this->db->getAffectedRows() === 1 ) {
             return true;
         }
 
@@ -152,8 +144,7 @@ 
 
     public function addCategory( $category_name, $category_rank )
     {
-        if( $this->isCategoryExists( $category_name ) )
-        {
+        if( $this->isCategoryExists( $category_name ) ) {
             return false;
         }
 
@@ -167,8 +158,7 @@ 
             $this->db_tbl['categories']
         );
 
-        if( $this->db->getAffectedRows() === 1 )
-        {
+        if( $this->db->getAffectedRows() === 1 ) {
             return $this->db->getInsertId();
         }
 
@@ -187,8 +177,7 @@ 
             )
         );
 
-        if( $this->db->getAffectedRows() === 1 )
-        {
+        if( $this->db->getAffectedRows() === 1 ) {
             return $category_id;
         }
         return false;

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

Braces +3 added lines, -2 removed lines

@@ -304,7 +304,8 @@ 
     }
 
     public function save($fields, $table, $where = '')
-    { // This is similar to "replace into table".
+    {
+// This is similar to "replace into table".
 
         if ($where === '') {
             $mode = 'insert';
@@ -386,7 +387,7 @@ 
     {
         $out = false;
         if (is_object($ds)) {
-            switch($mode){
+            switch($mode) {
                 case 'assoc':
                     $out = $ds->fetch_assoc();
                     break;

manager/includes/extenders/maketable.class.php

Braces +83 added lines, -42 removed lines

@@ -8,7 +8,8 @@ 
  *
  * @author Jason Coward <jason@opengeek.com> (MODX)
  */
-class MakeTable {
+class MakeTable
+{
 	public $actionField;
     public $cellAction;
     public $linkAction;
@@ -33,7 +34,8 @@ 
     public $fieldHeaders;
     public $extra;
 
-    public function __construct() {
+    public function __construct()
+    {
 		$this->fieldHeaders= array();
 		$this->excludeFields= array();
 		$this->actionField= '';
@@ -60,7 +62,8 @@ 
 	 *
 	 * @param $value A URL to execute when table cells are clicked.
 	 */
-    public function setCellAction($value) {
+    public function setCellAction($value)
+    {
 		$this->cellAction= $this->prepareLink($value);
 	}
 
@@ -69,7 +72,8 @@ 
 	 *
 	 * @param $value A URL to execute when text within table cells are clicked.
 	 */
-    public function setLinkAction($value) {
+    public function setLinkAction($value)
+    {
 		$this->linkAction= $this->prepareLink($value);
 	}
 
@@ -78,7 +82,8 @@ 
 	 *
 	 * @param $value A valid width attribute for the HTML TABLE tag
 	 */
-    public function setTableWidth($value) {
+    public function setTableWidth($value)
+    {
 		$this->tableWidth= $value;
 	}
 
@@ -87,7 +92,8 @@ 
 	 *
 	 * @param $value A class for the main HTML TABLE.
 	 */
-    public function setTableClass($value) {
+    public function setTableClass($value)
+    {
 		$this->tableClass= $value;
 	}
 
@@ -96,7 +102,8 @@ 
 	 *
 	 * @param $value A class for the main HTML TABLE.
 	 */
-    public function setTableID($value) {
+    public function setTableID($value)
+    {
 		$this->tableID= $value;
 	}
 
@@ -105,7 +112,8 @@ 
 	 *
 	 * @param $value A class for the table header row.
 	 */
-    public function setRowHeaderClass($value) {
+    public function setRowHeaderClass($value)
+    {
 		$this->rowHeaderClass= $value;
 	}
 
@@ -114,7 +122,8 @@ 
 	 *
 	 * @param $value A class for the table header row.
 	 */
-    public function setThHeaderClass($value) {
+    public function setThHeaderClass($value)
+    {
 		$this->thClass= $value;
 	}
 
@@ -123,7 +132,8 @@ 
 	 *
 	 * @param $value A class for the column header row.
 	 */
-    public function setColumnHeaderClass($value) {
+    public function setColumnHeaderClass($value)
+    {
 		$this->columnHeaderClass= $value;
 	}
 
@@ -132,7 +142,8 @@ 
 	 *
 	 * @param $value A class for regular table rows.
 	 */
-    public function setRowRegularClass($value) {
+    public function setRowRegularClass($value)
+    {
 		$this->rowRegularClass= $value;
 	}
 
@@ -141,7 +152,8 @@ 
 	 *
 	 * @param $value A class for alternate table rows.
 	 */
-    public function setRowAlternateClass($value) {
+    public function setRowAlternateClass($value)
+    {
 		$this->rowAlternateClass= $value;
 	}
 
@@ -150,7 +162,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function setFormElementType($value) {
+    public function setFormElementType($value)
+    {
 		$this->formElementType= $value;
 	}
 
@@ -159,7 +172,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element name attribute.
 	 */
-    public function setFormElementName($value) {
+    public function setFormElementName($value)
+    {
 		$this->formElementName= $value;
 	}
 
@@ -169,7 +183,8 @@ 
 	 *
 	 * @param $value Indicates the FORM name attribute.
 	 */
-    public function setFormName($value) {
+    public function setFormName($value)
+    {
 		$this->formName= $value;
 	}
 
@@ -178,7 +193,8 @@ 
 	 *
 	 * @param $value Indicates the FORM action attribute.
 	 */
-    public function setFormAction($value) {
+    public function setFormAction($value)
+    {
 		$this->formAction= $value;
 	}
 
@@ -187,7 +203,8 @@ 
 	 *
 	 * @param $value An Array of field keys to exclude from the table.
 	 */
-    public function setExcludeFields($value) {
+    public function setExcludeFields($value)
+    {
 		$this->excludeFields= $value;
 	}
 
@@ -196,7 +213,8 @@ 
 	 *
 	 * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
 	 */
-    public function setRowAlternatingScheme($value) {
+    public function setRowAlternatingScheme($value)
+    {
 		$this->rowAlternatingScheme= $value;
 	}
 
@@ -206,7 +224,8 @@ 
 	 *
 	 * @param $value The key of the field to add as a query string parameter.
 	 */
-    public function setActionFieldName($value) {
+    public function setActionFieldName($value)
+    {
 		$this->actionField= $value;
 	}
 
@@ -216,7 +235,8 @@ 
 	 * @param $value An Array of column widths in the order of the keys in the
 	 * 			source table array.
 	 */
-    public function setColumnWidths($widthArray) {
+    public function setColumnWidths($widthArray)
+    {
 		$this->columnWidths= $widthArray;
 	}
 
@@ -225,7 +245,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function setSelectedValues($valueArray) {
+    public function setSelectedValues($valueArray)
+    {
 		$this->selectedValues= $valueArray;
 	}
 
@@ -235,7 +256,8 @@ 
 	 *
 	 * @param $value A string of additional content.
 	 */
-    public function setExtra($value) {
+    public function setExtra($value)
+    {
 		$this->extra= $value;
 	}
 
@@ -244,7 +266,8 @@ 
 	 *
 	 * @param $columnPosition The index of the column to get the width for.
 	 */
-    public function getColumnWidth($columnPosition) {
+    public function getColumnWidth($columnPosition)
+    {
 		$currentWidth= '';
 		if (is_array($this->columnWidths)) {
 			$currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
@@ -257,7 +280,8 @@ 
 	 *
 	 * @param $value The position of the current row being rendered.
 	 */
-    public function determineRowClass($position) {
+    public function determineRowClass($position)
+    {
 		switch ($this->rowAlternatingScheme) {
 			case 'ODD' :
 				$modRemainder= 1;
@@ -280,7 +304,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function getCellAction($currentActionFieldValue) {
+    public function getCellAction($currentActionFieldValue)
+    {
 		if ($this->cellAction) {
 			$cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
 		}
@@ -293,7 +318,8 @@ 
 	 * @param $currentActionFieldValue The value to be applied to the link action.
 	 * @param $value The value of the cell.
 	 */
-    public function createCellText($currentActionFieldValue, $value) {
+    public function createCellText($currentActionFieldValue, $value)
+    {
 		$cell .= $value;
 		if ($this->linkAction) {
 			$cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
@@ -305,7 +331,8 @@ 
 	 * Sets an option to generate a check all link when checkbox is indicated
 	 * as the table formElementType.
 	 */
-    public function setAllOption() {
+    public function setAllOption()
+    {
 		$this->allOption= 1;
 	}
 
@@ -314,7 +341,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-    public function prepareLink($link) {
+    public function prepareLink($link)
+    {
 		if (strstr($link, '?')) {
 			$end= '&';
 		} else {
@@ -333,7 +361,8 @@ 
 	 * the $fieldsArray where the values represent the alt heading content
 	 * for each column.
 	 */
-    public function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") {
+    public function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="")
+    {
 	    global $_lang;
 		if (is_array($fieldsArray)) {
 			$i= 0;
@@ -369,7 +398,8 @@ 
 			if ($this->formElementType) {
 				$table= "\n".'<form id="'.$this->formName.'" name="'.$this->formName.'" action="'.$this->formAction.'" method="POST">'.$table;
 			}
-			if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
+			if (strlen($this->pageNav) > 1) {
+//changed to display the pagination if exists.
 				/* commented this part because of cookie
 				$table .= '<div id="max-display-records" ><select style="display:inline" onchange="javascript:updatePageSize(this[this.selectedIndex].value);">';
 				$pageSizes= array (10, 25, 50, 100, 250);
@@ -416,7 +446,8 @@ 
 	 * @param $numRecords The number of records to show per page.
 	 * @param $qs An optional query string to be appended to the paging links
 	 */
-    public function createPagingNavigation($numRecords, $qs='') {
+    public function createPagingNavigation($numRecords, $qs='')
+    {
 		global $_lang;
 		$currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
 		$numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
@@ -431,10 +462,11 @@ 
 			$offset= -4 + ($currentPage < 5 ? (5 - $currentPage) : 0);
 			$i= 1;
 			while ($i < 10 && ($currentPage + $offset <= $numPages)) {
-				if ($currentPage == $currentPage + $offset)
-					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
-				else
-					$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
+				if ($currentPage == $currentPage + $offset) {
+									$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset, true);
+				} else {
+									$nav .= $this->createPageLink($currentURL, $currentPage + $offset, $currentPage + $offset);
+				}
 				$i ++;
 				$offset ++;
 			}
@@ -457,11 +489,14 @@ 
 	 * @param $currentPage Indicates if the link is to the current page.
 	 * @param $qs And optional query string to be appended to the link.
 	 */
-    public function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') {
+    public function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='')
+    {
 		global $modx;
 		$orderBy= !empty($_GET['orderby'])? '&orderby=' . $_GET['orderby']: '';
 		$orderDir= !empty($_GET['orderdir'])? '&orderdir=' . $_GET['orderdir']: '';
-		if (!empty($qs)) $qs= "?$qs";
+		if (!empty($qs)) {
+		    $qs= "?$qs";
+		}
 		$link= empty($link)? $modx->makeUrl($modx->documentIdentifier, $modx->documentObject['alias'], $qs . "page=$pageNum$orderBy$orderDir"): $this->prepareLink($link) . "page=$pageNum";
 		$nav .= '<li'.($currentPage? ' class="currentPage"': '').'><a'.($currentPage? ' class="currentPage"': '').' href="'.$link.'">'.$displayText.'</a></li>'."\n";
 		return $nav;
@@ -474,7 +509,8 @@ 
 	 * @param $isChecked Indicates if the checked attribute should apply to the
 	 * element.
 	 */
-    public function addFormField($value, $isChecked) {
+    public function addFormField($value, $isChecked)
+    {
 		if ($this->formElementType) {
 			$checked= $isChecked? "checked ": "";
 			$field= "\t\t".'<td><input type="'.$this->formElementType.'" name="'. ($this->formElementName ? $this->formElementName : $value).'"  value="'.$value.'" '.$checked.'/></td>'."\n";
@@ -486,7 +522,8 @@ 
 	 * Generates the proper LIMIT clause for queries to retrieve paged results in
 	 * a MakeTable $fieldsArray.
 	 */
-    public function handlePaging() {
+    public function handlePaging()
+    {
 		$offset= (is_numeric($_GET['page']) && $_GET['page'] > 0) ? $_GET['page'] - 1 : 0;
 		$limitClause= ' LIMIT '. ($offset * MAX_DISPLAY_RECORDS_NUM).', '.MAX_DISPLAY_RECORDS_NUM;
 		return $limitClause;
@@ -498,7 +535,8 @@ 
 	 *
 	 * @param $natural_order If true, the results are returned in natural order.
 	 */
-    public function handleSorting($natural_order=false) {
+    public function handleSorting($natural_order=false)
+    {
 		$orderByClause= '';
 		if (!$natural_order) {
 			$orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
@@ -516,7 +554,8 @@ 
 	 * @param $text The text for the link (e.g. table column header).
 	 * @param $qs An optional query string to append to the order by link.
 	 */
-    public function prepareOrderByLink($key, $text, $qs='') {
+    public function prepareOrderByLink($key, $text, $qs='')
+    {
 		global $modx;
 		if (!empty($_GET['orderdir'])) {
 			$orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
@@ -524,7 +563,9 @@ 
 			$orderDir= '&orderdir=asc';
 		}
 		if (!empty($qs)) {
-			if (!strrpos($qs, '&')==strlen($qs)-1) $qs.= '&';
+			if (!strrpos($qs, '&')==strlen($qs)-1) {
+			    $qs.= '&';
+			}
 		}
 		return '<a href="[~'.$modx->documentIdentifier.'~]?'.$qs.'orderby='.$key.$orderDir.'">'.$text.'</a>';
 	}

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

Braces +5 added lines, -2 removed lines

@@ -1,8 +1,11 @@
 <?php
 $userid = (int)$value;
 if (!isset($modx->filter->cache['ui'][$userid])) {
-    if ($userid < 0) $user = $modx->getWebUserInfo(abs($userid));
-    else             $user = $modx->getUserInfo($userid);
+    if ($userid < 0) {
+        $user = $modx->getWebUserInfo(abs($userid));
+    } else {
+        $user = $modx->getUserInfo($userid);
+    }
     $modx->filter->cache['ui'][$userid] = $user;
 } else {
     $user = $modx->filter->cache['ui'][$userid];

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

Braces +28 added lines, -13 removed lines

@@ -1,9 +1,11 @@ 
 <?php
-if(strpos($opt,',')) list($limit,$delim) = explode(',', $opt);
-elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';}
-else {$limit=124;$delim='';}
+if(strpos($opt,',')) {
+    list($limit,$delim) = explode(',', $opt);
+} elseif(preg_match('/^[1-9][0-9]*$/',$opt)) {$limit=$opt;$delim='';} else {$limit=124;$delim='';}
 
-if($delim==='') $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
+if($delim==='') {
+    $delim = $modx->config['manager_language']==='japanese-utf8' ? '。' : '.';
+}
 $limit = (int)$limit;
 
 $content = $modx->filter->parseDocumentSource($value);
@@ -11,8 +13,9 @@ 
 $content = strip_tags($content);
 
 $content = str_replace(array("\r\n","\r","\n","\t",'&nbsp;'),' ',$content);
-if(preg_match('/\s+/',$content))
+if(preg_match('/\s+/',$content)) {
     $content = preg_replace('/\s+/',' ',$content);
+}
 $content = trim($content);
 
 $pos = $modx->filter->strpos($content, $delim);
@@ -21,23 +24,35 @@ 
     $_ = explode($delim, $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.$delim)) break;
+        if($limit <= $modx->filter->strlen($text.$v.$delim)) {
+            break;
+        }
         $text .= $v.$delim;
     }
-    if($text) $content = $text;
-}
+    if($text) {
+        $content = $text;
+    }
+    }
 
 if($limit<$modx->filter->strlen($content) && strpos($content,' ')!==false) {
     $_ = explode(' ', $content);
     $text = '';
     foreach($_ as $v) {
-        if($limit <= $modx->filter->strlen($text.$v.' ')) break;
+        if($limit <= $modx->filter->strlen($text.$v.' ')) {
+            break;
+        }
         $text .= $v . ' ';
     }
-    if($text!=='') $content = $text;
-}
+    if($text!=='') {
+        $content = $text;
+    }
+    }
 
-if($limit < $modx->filter->strlen($content)) $content = $modx->filter->substr($content, 0, $limit);
-if($modx->filter->substr($content,-1)==$delim) $content = rtrim($content,$delim) . $delim;
+if($limit < $modx->filter->strlen($content)) {
+    $content = $modx->filter->substr($content, 0, $limit);
+}
+if($modx->filter->substr($content,-1)==$delim) {
+    $content = rtrim($content,$delim) . $delim;
+}
 
 return $content;

manager/includes/extenders/deprecated.functions.inc.php

Braces +66 added lines, -35 removed lines

@@ -1,16 +1,32 @@ 
 <?php
 $this->old = new OldFunctions();
-class OldFunctions {
+class OldFunctions
+{
 
-    public function dbConnect()                 {global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
-    public function dbQuery($sql)               {global $modx;return $modx->db->query($sql);}
-    public function recordCount($rs)            {global $modx;return $modx->db->getRecordCount($rs);}
-    public function fetchRow($rs,$mode='assoc') {global $modx;return $modx->db->getRow($rs, $mode);}
-    public function affectedRows($rs)           {global $modx;return $modx->db->getAffectedRows($rs);}
-    public function insertId($rs)               {global $modx;return $modx->db->getInsertId($rs);}
-    public function dbClose()                   {global $modx;       $modx->db->disconnect();}
+    public function dbConnect()
+    {
+global $modx;       $modx->db->connect();$modx->rs = $modx->db->conn;}
+    public function dbQuery($sql)
+    {
+global $modx;return $modx->db->query($sql);}
+    public function recordCount($rs)
+    {
+global $modx;return $modx->db->getRecordCount($rs);}
+    public function fetchRow($rs,$mode='assoc')
+    {
+global $modx;return $modx->db->getRow($rs, $mode);}
+    public function affectedRows($rs)
+    {
+global $modx;return $modx->db->getAffectedRows($rs);}
+    public function insertId($rs)
+    {
+global $modx;return $modx->db->getInsertId($rs);}
+    public function dbClose()
+    {
+global $modx;       $modx->db->disconnect();}
 
-    public function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0) {
+    public function makeList($array, $ulroot= 'root', $ulprefix= 'sub_', $type= '', $ordered= false, $tablevel= 0)
+    {
         // first find out whether the value passed is an array
         if (!is_array($array)) {
             return "<ul><li>Bad list</li></ul>";
@@ -37,7 +53,8 @@ 
     }
 
 
-    public function getUserData() {
+    public function getUserData()
+    {
         $client['ip'] = $_SERVER['REMOTE_ADDR'];
         $client['ua'] = $_SERVER['HTTP_USER_AGENT'];
     	return $client;
@@ -45,35 +62,42 @@ 
 
     # Returns true, install or interact when inside manager
     // deprecated
-    public function insideManager() {
+    public function insideManager()
+    {
         $m= false;
         if( defined('IN_MANAGER_MODE') && IN_MANAGER_MODE === true) {
             $m= true;
-            if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true')
-                $m= "interact";
-            else
-                if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true')
-                    $m= "install";
+            if (defined('SNIPPET_INTERACTIVE_MODE') && SNIPPET_INTERACTIVE_MODE == 'true') {
+                            $m= "interact";
+            } else
+                if (defined('SNIPPET_INSTALL_MODE') && SNIPPET_INSTALL_MODE == 'true') {
+                                    $m= "install";
+                }
         }
         return $m;
     }
 
     // deprecated
-    public function putChunk($chunkName) { // alias name >.<
+    public function putChunk($chunkName)
+    {
+// alias name >.<
     	global $modx;
         return $modx->getChunk($chunkName);
     }
 
-    public function getDocGroups() {
+    public function getDocGroups()
+    {
     	global $modx;
         return $modx->getUserDocGroups();
     } // deprecated
 
-    public function changePassword($o, $n) {
+    public function changePassword($o, $n)
+    {
         return changeWebUserPassword($o, $n);
     } // deprecated
 
-    public function userLoggedIn() {
+    public function userLoggedIn()
+    {
     	global $modx;
         $userdetails= array ();
         if ($modx->isFrontend() && isset ($_SESSION['webValidated'])) {
@@ -96,18 +120,22 @@ 
             }
     }
 
-    public function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD) {
+    public function getFormVars($method= "", $prefix= "", $trim= "", $REQUEST_METHOD)
+    {
         //  function to retrieve form results into an associative array
     	global $modx;
         $results= array ();
         $method= strtoupper($method);
-        if ($method == "")
-            $method= $REQUEST_METHOD;
-        if ($method == "POST")
-            $method= & $_POST;
-        elseif ($method == "GET") $method= & $_GET;
-        else
-            return false;
+        if ($method == "") {
+                    $method= $REQUEST_METHOD;
+        }
+        if ($method == "POST") {
+                    $method= & $_POST;
+        } elseif ($method == "GET") {
+            $method= & $_GET;
+        } else {
+                    return false;
+        }
         reset($method);
         foreach ($method as $key => $value) {
             if (($prefix != "") && (substr($key, 0, strlen($prefix)) == $prefix)) {
@@ -115,10 +143,12 @@ 
                     $pieces= explode($prefix, $key, 2);
                     $key= $pieces[1];
                     $results[$key]= $value;
-                } else
-                    $results[$key]= $value;
+                } else {
+                                    $results[$key]= $value;
+                }
+            } elseif ($prefix == "") {
+                $results[$key]= $value;
             }
-            elseif ($prefix == "") $results[$key]= $value;
         }
         return $results;
     }
@@ -129,7 +159,8 @@ 
      * @param string $msg Message to show
      * @param string $url URL to redirect to
      */
-    public function webAlert($msg, $url= "") {
+    public function webAlert($msg, $url= "")
+    {
     	global $modx;
         $msg= addslashes($modx->db->escape($msg));
         if (substr(strtolower($url), 0, 11) == "javascript:") {
@@ -139,9 +170,9 @@ 
             $act= ($url ? "window.location.href='" . addslashes($url) . "';" : "");
         }
         $html= "<script>$fnc window.setTimeout(\"alert('$msg');$act\",100);</script>";
-        if ($modx->isFrontend())
-            $modx->regClientScript($html);
-        else {
+        if ($modx->isFrontend()) {
+                    $modx->regClientScript($html);
+        } else {
             echo $html;
         }
     }

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

Braces +85 added lines, -69 removed lines

@@ -13,27 +13,31 @@ 
     public $dirCheckCount = 0;
 
     public function __construct()
-	{
+    {
 		global $modx;
 
-		if(!defined('MODX_BASE_PATH'))  return false;
+		if(!defined('MODX_BASE_PATH')) {
+		    return false;
+		}
 		$this->exportstart = $this->get_mtime();
 		$this->count = 0;
 		$this->setUrlMode();
 		$this->generate_mode = 'crawl';
 		$this->targetDir = $modx->config['base_path'] . 'temp/export';
-		if(!isset($this->total)) $this->getTotal();
+		if(!isset($this->total)) {
+		    $this->getTotal();
+		}
 	}
 
     public function setExportDir($dir)
-	{
+    {
 		$dir = str_replace('\\','/',$dir);
 		$dir = rtrim($dir, '/');
 		$this->targetDir = $dir;
 	}
 
     public function get_mtime()
-	{
+    {
 		$mtime = microtime();
 		$mtime = explode(' ', $mtime);
 		$mtime = $mtime[1] + $mtime[0];
@@ -41,11 +45,10 @@ 
 	}
 
     public function setUrlMode()
-	{
+    {
 		global $modx;
 
-		if($modx->config['friendly_urls']==0)
-		{
+		if($modx->config['friendly_urls']==0) {
 			$modx->config['friendly_urls']  = 1;
 			$modx->config['use_alias_path'] = 1;
 			$modx->clearCache('full');
@@ -54,13 +57,12 @@ 
 	}
 
     public function getTotal($ignore_ids='', $noncache='0')
-	{
+    {
 		global $modx;
 		$tbl_site_content = $modx->getFullTableName('site_content');
 
 		$ignore_ids = array_filter(array_map('intval', explode(',', $ignore_ids)));
-		if(count($ignore_ids)>0)
-		{
+		if(count($ignore_ids)>0) {
 			$ignore_ids = "AND NOT id IN ('".implode("','", $ignore_ids)."')";
 		} else {
 			$ignore_ids = '';
@@ -76,67 +78,80 @@ 
 	}
 
     public function removeDirectoryAll($directory='')
-	{
+    {
 	    $rs = false;
-		if(empty($directory)) $directory = $this->targetDir;
+		if(empty($directory)) {
+		    $directory = $this->targetDir;
+		}
 		$directory = rtrim($directory,'/');
 		// if the path is not valid or is not a directory ...
-		if(empty($directory)) return false;
-		if(strpos($directory,MODX_BASE_PATH)===false) return $rs;
+		if(empty($directory)) {
+		    return false;
+		}
+		if(strpos($directory,MODX_BASE_PATH)===false) {
+		    return $rs;
+		}
 
-		if(!is_dir($directory))          return $rs;
-		elseif(!is_readable($directory)) return $rs;
-		else
-		{
+		if(!is_dir($directory)) {
+		    return $rs;
+		} elseif(!is_readable($directory)) {
+		    return $rs;
+		} else {
 			$files = glob($directory . '/*');
-			if(!empty($files))
-			{
-    			foreach($files as $path)
-    			{
+			if(!empty($files)) {
+    			foreach($files as $path) {
                     $rs = is_dir($path) ? $this->removeDirectoryAll($path) : unlink($path);
     			}
 			}
 		}
-		if($directory !== $this->targetDir) $rs = rmdir($directory);
+		if($directory !== $this->targetDir) {
+		    $rs = rmdir($directory);
+		}
 
 		return $rs;
 	}
 
     public function makeFile($docid, $filepath)
-	{
+    {
 		global  $modx,$_lang;
 		$file_permission = octdec($modx->config['new_file_permissions']);
-		if($this->generate_mode==='direct')
-		{
+		if($this->generate_mode==='direct') {
 			$back_lang = $_lang;
 			$src = $modx->executeParser($docid);
 
 			$_lang = $back_lang;
+		} else {
+		    $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
 		}
-		else $src = $this->curl_get_contents(MODX_SITE_URL . "index.php?id={$docid}");
 
 
-		if($src !== false)
-		{
-			if($this->repl_before!==$this->repl_after) $src = str_replace($this->repl_before,$this->repl_after,$src);
+		if($src !== false) {
+			if($this->repl_before!==$this->repl_after) {
+			    $src = str_replace($this->repl_before,$this->repl_after,$src);
+			}
 			$result = file_put_contents($filepath,$src);
-			if($result!==false) @chmod($filepath, $file_permission);
+			if($result!==false) {
+			    @chmod($filepath, $file_permission);
+			}
 
-			if($result !== false) return 'success';
-			else                  return 'failed_no_write';
+			if($result !== false) {
+			    return 'success';
+			} else {
+			    return 'failed_no_write';
+			}
+		} else {
+		    return 'failed_no_retrieve';
 		}
-		else                      return 'failed_no_retrieve';
 	}
 
     public function getFileName($docid, $alias='', $prefix, $suffix)
-	{
+    {
 		global $modx;
 
-		if($alias==='') $filename = $prefix.$docid.$suffix;
-		else
-		{
-			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false)
-			{
+		if($alias==='') {
+		    $filename = $prefix.$docid.$suffix;
+		} else {
+			if($modx->config['suffix_mode']==='1' && strpos($alias, '.')!==false) {
 				$suffix = '';
 			}
 			$filename = $prefix.$alias.$suffix;
@@ -145,7 +160,7 @@ 
 	}
 
     public function run($parent=0)
-	{
+    {
 		global $_lang;
 		global $modx;
 
@@ -187,24 +202,20 @@ 
 		$ph = array();
 		$ph['total']     = $this->total;
 		$folder_permission = octdec($modx->config['new_folder_permissions']);
-		while($row = $modx->db->getRow($rs))
-		{
+		while($row = $modx->db->getRow($rs)) {
 			$this->count++;
             $filename = '';
 			$row['count']     = $this->count;
 			$row['url'] = $modx->makeUrl($row['id']);
 
-			if (!$row['wasNull'])
-			{ // needs writing a document
+			if (!$row['wasNull']) {
+// needs writing a document
 				$docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
 				$filename = $dirpath.$docname;
-				if (!is_file($filename))
-				{
-					if($row['published']==='1')
-					{
+				if (!is_file($filename)) {
+					if($row['published']==='1') {
 						$status = $this->makeFile($row['id'], $filename);
-						switch($status)
-						{
+						switch($status) {
 							case 'failed_no_write'   :
                                                             $row['status'] = $msg_failed_no_write;
                                                             break;
@@ -214,34 +225,38 @@ 
 							default:
                                                             $row['status'] = $msg_success;
 						}
+					} else {
+					    $row['status'] = $msg_failed_no_retrieve;
 					}
-					else $row['status'] = $msg_failed_no_retrieve;
+				} else {
+				    $row['status'] = $msg_success_skip_doc;
 				}
-				else     $row['status'] = $msg_success_skip_doc;
 				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
-			}
-			else
-			{
+			} else {
 				$row['status'] = $msg_success_skip_dir;
 				$this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
 			}
-			if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false))
-			{ // needs making a folder
+			if ($row['isfolder']==='1' && ($modx->config['suffix_mode']!=='1' || strpos($row['alias'],'.')===false)) {
+// needs making a folder
 				$end_dir = ($row['alias']!=='') ? $row['alias'] : $row['id'];
 				$dir_path = $dirpath . $end_dir;
-				if(strpos($dir_path,MODX_BASE_PATH)===false) return FALSE;
-				if (!is_dir($dir_path))
-				{
-					if (is_file($dir_path)) @unlink($dir_path);
+				if(strpos($dir_path,MODX_BASE_PATH)===false) {
+				    return FALSE;
+				}
+				if (!is_dir($dir_path)) {
+					if (is_file($dir_path)) {
+					    @unlink($dir_path);
+					}
 					mkdir($dir_path);
 					@chmod($dir_path, $folder_permission);
 
 				}
 
 
-				if($modx->config['make_folders']==='1' && $row['published']==='1')
-				{
-					if( ! empty($filename) && is_file($filename)) rename($filename,$dir_path . '/index.html');
+				if($modx->config['make_folders']==='1' && $row['published']==='1') {
+					if( ! empty($filename) && is_file($filename)) {
+					    rename($filename,$dir_path . '/index.html');
+					}
 				}
 				$this->targetDir = $dir_path;
 				$this->run($row['id']);
@@ -252,7 +267,9 @@ 
 
     public function curl_get_contents($url, $timeout = 30 )
     {
-    	if(!function_exists('curl_init')) return @file_get_contents($url);
+    	if(!function_exists('curl_init')) {
+    	    return @file_get_contents($url);
+    	}
 
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
@@ -269,8 +286,7 @@ 
 
     public function parsePlaceholder($tpl,$ph=array())
     {
-    	foreach($ph as $k=>$v)
-    	{
+    	foreach($ph as $k=>$v) {
     		$k = "[+{$k}+]";
     		$tpl = str_replace($k,$v,$tpl);
     	}