evolution-cms / evolution

manager/actions/help/version_notices/1.3.1.php

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(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(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 ?>
 <p></p>
 <ul>

manager/actions/help/version_notices/1.3.2.php

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(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(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 ?>
 <p></p>
 <ul>

manager/actions/help/version_notices/1.3.5.php

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(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(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 ?>
 <p></p>
 <ul>

manager/actions/help/version_notices/1.3.3.php

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(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(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 ?>
 <p></p>
 <ul>

manager/includes/veriword.php

Braces +16 added lines, -8 removed lines

@@ -43,7 +43,8 @@ 
 ## see sample.php for test and usage
 ## sample URL: http://www.program-ruti.org/veriword/
 ####
-class VeriWord {
+class VeriWord
+{
 
     /* path to font directory*/
     var $dir_font   = "ttf/";
@@ -53,7 +54,8 @@ 
     var $im_width   = 0;
     var $im_height  = 0;
 
-    function __construct($w=200, $h=80) {
+    function __construct($w=200, $h=80)
+    {
         /* create session to set word for verification */
         startCMSSession();
         $this->set_veriword();
@@ -62,21 +64,24 @@ 
         $this->im_height        = $h;
     }
 
-    function set_veriword() {
+    function set_veriword()
+    {
         /* create session variable for verification,
            you may change the session variable name */
         $this->word             = $this->pick_word();
         $_SESSION['veriword']   = $this->word;
     }
 
-    function output_image() {
+    function output_image()
+    {
         /* output the image as jpeg */
         $this->draw_image();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    function pick_word() {
+    function pick_word()
+    {
         global $modx;
         // set default words
         $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
@@ -87,7 +92,8 @@ 
         return (string) $arr_words[array_rand($arr_words)].rand(10,999);
     }
 
-    function draw_text() {
+    function draw_text()
+    {
         $dir = dir($this->dir_font);
         $fontstmp = array();
         while (false !== ($file = $dir->read())) {
@@ -143,7 +149,8 @@ 
     }
 
 
-    function draw_image() {
+    function draw_image()
+    {
 
         /* pick one background image randomly from image directory */
         $img_file       = $this->dir_noise."noise".rand(1,4).".jpg";
@@ -174,7 +181,8 @@ 
         return $this->im;
     }
 
-    function destroy_image() {
+    function destroy_image()
+    {
 
         imagedestroy($this->im);
 

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
+{
 	var $actionField;
 	var $cellAction;
 	var $linkAction;
@@ -31,7 +32,8 @@ 
 	var $columnWidths;
 	var $selectedValues;
 
-	function __construct() {
+	function __construct()
+	{
 		$this->fieldHeaders= array();
 		$this->excludeFields= array();
 		$this->actionField= '';
@@ -58,7 +60,8 @@ 
 	 *
 	 * @param $value A URL to execute when table cells are clicked.
 	 */
-	function setCellAction($value) {
+	function setCellAction($value)
+	{
 		$this->cellAction= $this->prepareLink($value);
 	}
 
@@ -67,7 +70,8 @@ 
 	 *
 	 * @param $value A URL to execute when text within table cells are clicked.
 	 */
-	function setLinkAction($value) {
+	function setLinkAction($value)
+	{
 		$this->linkAction= $this->prepareLink($value);
 	}
 
@@ -76,7 +80,8 @@ 
 	 *
 	 * @param $value A valid width attribute for the HTML TABLE tag
 	 */
-	function setTableWidth($value) {
+	function setTableWidth($value)
+	{
 		$this->tableWidth= $value;
 	}
 
@@ -85,7 +90,8 @@ 
 	 *
 	 * @param $value A class for the main HTML TABLE.
 	 */
-	function setTableClass($value) {
+	function setTableClass($value)
+	{
 		$this->tableClass= $value;
 	}
 
@@ -94,7 +100,8 @@ 
 	 *
 	 * @param $value A class for the main HTML TABLE.
 	 */
-	function setTableID($value) {
+	function setTableID($value)
+	{
 		$this->tableID= $value;
 	}
 
@@ -103,7 +110,8 @@ 
 	 *
 	 * @param $value A class for the table header row.
 	 */
-	function setRowHeaderClass($value) {
+	function setRowHeaderClass($value)
+	{
 		$this->rowHeaderClass= $value;
 	}
 
@@ -112,7 +120,8 @@ 
 	 *
 	 * @param $value A class for the table header row.
 	 */
-	function setThHeaderClass($value) {
+	function setThHeaderClass($value)
+	{
 		$this->thClass= $value;
 	}
 
@@ -121,7 +130,8 @@ 
 	 *
 	 * @param $value A class for the column header row.
 	 */
-	function setColumnHeaderClass($value) {
+	function setColumnHeaderClass($value)
+	{
 		$this->columnHeaderClass= $value;
 	}
 
@@ -130,7 +140,8 @@ 
 	 *
 	 * @param $value A class for regular table rows.
 	 */
-	function setRowRegularClass($value) {
+	function setRowRegularClass($value)
+	{
 		$this->rowRegularClass= $value;
 	}
 
@@ -139,7 +150,8 @@ 
 	 *
 	 * @param $value A class for alternate table rows.
 	 */
-	function setRowAlternateClass($value) {
+	function setRowAlternateClass($value)
+	{
 		$this->rowAlternateClass= $value;
 	}
 
@@ -148,7 +160,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-	function setFormElementType($value) {
+	function setFormElementType($value)
+	{
 		$this->formElementType= $value;
 	}
 
@@ -157,7 +170,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element name attribute.
 	 */
-	function setFormElementName($value) {
+	function setFormElementName($value)
+	{
 		$this->formElementName= $value;
 	}
 
@@ -167,7 +181,8 @@ 
 	 *
 	 * @param $value Indicates the FORM name attribute.
 	 */
-	function setFormName($value) {
+	function setFormName($value)
+	{
 		$this->formName= $value;
 	}
 
@@ -176,7 +191,8 @@ 
 	 *
 	 * @param $value Indicates the FORM action attribute.
 	 */
-	function setFormAction($value) {
+	function setFormAction($value)
+	{
 		$this->formAction= $value;
 	}
 
@@ -185,7 +201,8 @@ 
 	 *
 	 * @param $value An Array of field keys to exclude from the table.
 	 */
-	function setExcludeFields($value) {
+	function setExcludeFields($value)
+	{
 		$this->excludeFields= $value;
 	}
 
@@ -194,7 +211,8 @@ 
 	 *
 	 * @param $value 'ODD' or 'EVEN' to indicate the alternate row scheme.
 	 */
-	function setRowAlternatingScheme($value) {
+	function setRowAlternatingScheme($value)
+	{
 		$this->rowAlternatingScheme= $value;
 	}
 
@@ -204,7 +222,8 @@ 
 	 *
 	 * @param $value The key of the field to add as a query string parameter.
 	 */
-	function setActionFieldName($value) {
+	function setActionFieldName($value)
+	{
 		$this->actionField= $value;
 	}
 
@@ -214,7 +233,8 @@ 
 	 * @param $value An Array of column widths in the order of the keys in the
 	 * 			source table array.
 	 */
-	function setColumnWidths($widthArray) {
+	function setColumnWidths($widthArray)
+	{
 		$this->columnWidths= $widthArray;
 	}
 
@@ -223,7 +243,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-	function setSelectedValues($valueArray) {
+	function setSelectedValues($valueArray)
+	{
 		$this->selectedValues= $valueArray;
 	}
 
@@ -233,7 +254,8 @@ 
 	 *
 	 * @param $value A string of additional content.
 	 */
-	function setExtra($value) {
+	function setExtra($value)
+	{
 		$this->extra= $value;
 	}
 
@@ -242,7 +264,8 @@ 
 	 *
 	 * @param $columnPosition The index of the column to get the width for.
 	 */
-	function getColumnWidth($columnPosition) {
+	function getColumnWidth($columnPosition)
+	{
 		$currentWidth= '';
 		if (is_array($this->columnWidths)) {
 			$currentWidth= $this->columnWidths[$columnPosition] ? ' width="'.$this->columnWidths[$columnPosition].'" ' : '';
@@ -255,7 +278,8 @@ 
 	 *
 	 * @param $value The position of the current row being rendered.
 	 */
-	function determineRowClass($position) {
+	function determineRowClass($position)
+	{
 		switch ($this->rowAlternatingScheme) {
 			case 'ODD' :
 				$modRemainder= 1;
@@ -278,7 +302,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-	function getCellAction($currentActionFieldValue) {
+	function getCellAction($currentActionFieldValue)
+	{
 		if ($this->cellAction) {
 			$cellAction= ' onClick="javascript:window.location=\''.$this->cellAction.$this->actionField.'='.urlencode($currentActionFieldValue).'\'" ';
 		}
@@ -291,7 +316,8 @@ 
 	 * @param $currentActionFieldValue The value to be applied to the link action.
 	 * @param $value The value of the cell.
 	 */
-	function createCellText($currentActionFieldValue, $value) {
+	function createCellText($currentActionFieldValue, $value)
+	{
 		$cell .= $value;
 		if ($this->linkAction) {
 			$cell= '<a href="'.$this->linkAction.$this->actionField.'='.urlencode($currentActionFieldValue).'">'.$cell.'</a>';
@@ -303,7 +329,8 @@ 
 	 * Sets an option to generate a check all link when checkbox is indicated
 	 * as the table formElementType.
 	 */
-	function setAllOption() {
+	function setAllOption()
+	{
 		$this->allOption= 1;
 	}
 
@@ -312,7 +339,8 @@ 
 	 *
 	 * @param $value Indicates the INPUT form element type attribute.
 	 */
-	function prepareLink($link) {
+	function prepareLink($link)
+	{
 		if (strstr($link, '?')) {
 			$end= '&';
 		} else {
@@ -331,7 +359,8 @@ 
 	 * the $fieldsArray where the values represent the alt heading content
 	 * for each column.
 	 */
-	function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="") {
+	function create($fieldsArray, $fieldHeadersArray=array(),$linkpage="")
+	{
 	global $_lang;
 		if (is_array($fieldsArray)) {
 			$i= 0;
@@ -367,7 +396,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);
@@ -414,7 +444,8 @@ 
 	 * @param $numRecords The number of records to show per page.
 	 * @param $qs An optional query string to be appended to the paging links
 	 */
-	function createPagingNavigation($numRecords, $qs='') {
+	function createPagingNavigation($numRecords, $qs='')
+	{
 		global $_lang;
 		$currentPage= (is_numeric($_GET['page']) ? $_GET['page'] : 1);
 		$numPages= ceil($numRecords / MAX_DISPLAY_RECORDS_NUM);
@@ -429,10 +460,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 ++;
 			}
@@ -455,11 +487,14 @@ 
 	 * @param $currentPage Indicates if the link is to the current page.
 	 * @param $qs And optional query string to be appended to the link.
 	 */
-	function createPageLink($link='', $pageNum, $displayText, $currentPage=false, $qs='') {
+	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;
@@ -472,7 +507,8 @@ 
 	 * @param $isChecked Indicates if the checked attribute should apply to the
 	 * element.
 	 */
-	function addFormField($value, $isChecked) {
+	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";
@@ -484,7 +520,8 @@ 
 	 * Generates the proper LIMIT clause for queries to retrieve paged results in
 	 * a MakeTable $fieldsArray.
 	 */
-	function handlePaging() {
+	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;
@@ -496,7 +533,8 @@ 
 	 *
 	 * @param $natural_order If true, the results are returned in natural order.
 	 */
-	function handleSorting($natural_order=false) {
+	function handleSorting($natural_order=false)
+	{
 		$orderByClause= '';
 		if (!$natural_order) {
 			$orderby= !empty($_GET['orderby'])? $_GET['orderby']: "id";
@@ -514,7 +552,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.
 	 */
-	function prepareOrderByLink($key, $text, $qs='') {
+	function prepareOrderByLink($key, $text, $qs='')
+	{
 		global $modx;
 		if (!empty($_GET['orderdir'])) {
 			$orderDir= strtolower($_GET['orderdir'])=='desc'? '&orderdir=asc': '&orderdir=desc';
@@ -522,7 +561,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/message.quit.inc.php

Braces +3 added lines, -1 removed lines

@@ -3,7 +3,9 @@
  * Message Quit Template
  *
  */
-if(IN_MANAGER_MODE!="true" && IN_PARSER_MODE!="true") die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited.");
+if(IN_MANAGER_MODE!="true" && IN_PARSER_MODE!="true") {
+    die("<b>INCLUDE ACCESS ERROR</b><br /><br />Direct access to this file prohibited.");
+}
 
 $parsedMessageString = "
 <html><head><title>EVO Content Manager $version &raquo; $release_date</title>

manager/includes/settings.inc.php

Braces +9 added lines, -4 removed lines

@@ -1,10 +1,13 @@ 
 <?php
-if(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(IN_MANAGER_MODE!="true") {
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
+}
 
 // get the settings from the database.
 $settings = array();
-if ($modx && count($modx->config)>0) $settings = $modx->config;
-else{
+if ($modx && count($modx->config)>0) {
+    $settings = $modx->config;
+} else {
 	$rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('system_settings'));
 	while ($row = $modx->db->getRow($rs)) {
 		$settings[$row['setting_name']] = $row['setting_value'];
@@ -14,4 +17,6 @@ 
 extract($settings, EXTR_OVERWRITE);
 
 // setup default site id - new installation should generate a unique id for the site.
-if(!isset($site_id)) $site_id = "MzGeQ2faT4Dw06+U49x3";
+if(!isset($site_id)) {
+    $site_id = "MzGeQ2faT4Dw06+U49x3";
+}

manager/media/rss/rss_cache.inc

Braces +26 added lines, -19 removed lines

@@ -16,12 +16,14 @@ 
  *
  */
 
-class RSSCache {
+class RSSCache
+{
     var $BASE_CACHE = './cache';    // where the cache files are stored
     var $MAX_AGE    = 3600;         // when are files stale, default one hour
     var $ERROR      = "";           // accumulate error messages
 
-    function __construct($base='', $age='') {
+    function __construct($base='', $age='')
+    {
         if ( $base ) {
             $this->BASE_CACHE = $base;
         }
@@ -48,7 +50,8 @@ 
     Input:      url from wich the rss file was fetched
     Output:     true on sucess
 \*=======================================================================*/
-    function set ($url, $rss) {
+    function set ($url, $rss)
+    {
         $this->ERROR = "";
         $cache_file = $this->file_name( $url );
         $fp = @fopen( $cache_file, 'w' );
@@ -74,7 +77,8 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS
 \*=======================================================================*/
-    function get ($url) {
+    function get ($url)
+    {
         $this->ERROR = "";
         $cache_file = $this->file_name( $url );
 
@@ -110,7 +114,8 @@ 
     Input:      url from wich the rss file was fetched
     Output:     cached object on HIT, false on MISS
 \*=======================================================================*/
-    function check_cache ( $url ) {
+    function check_cache ( $url )
+    {
         $this->ERROR = "";
         $filename = $this->file_name( $url );
 
@@ -122,26 +127,24 @@ 
             if ( $this->MAX_AGE > $age ) {
                 // object exists and is current
                 return 'HIT';
-            }
-            else {
+            } else {
                 // object exists but is old
                 return 'STALE';
             }
-        }
-        else {
+        } else {
             // object does not exist
             return 'MISS';
         }
     }
 
-	function cache_age( $cache_key ) {
+	function cache_age( $cache_key )
+	{
 		$filename = $this->file_name( $url );
 		if ( file_exists( $filename ) ) {
 			$mtime = filemtime( $filename );
             $age = time() - $mtime;
 			return $age;
-		}
-		else {
+		} else {
 			return -1;
 		}
 	}
@@ -149,14 +152,16 @@ 
 /*=======================================================================*\
     Function:   serialize
 \*=======================================================================*/
-    function serialize ( $rss ) {
+    function serialize ( $rss )
+    {
         return serialize( $rss );
     }
 
 /*=======================================================================*\
     Function:   unserialize
 \*=======================================================================*/
-    function unserialize ( $data ) {
+    function unserialize ( $data )
+    {
         return unserialize( $data );
     }
 
@@ -166,7 +171,8 @@ 
     Input:      url from wich the rss file was fetched
     Output:     a file name
 \*=======================================================================*/
-    function file_name ($url) {
+    function file_name ($url)
+    {
         $filename = md5( $url );
         return join( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) );
     }
@@ -175,7 +181,8 @@ 
     Function:   error
     Purpose:    register error
 \*=======================================================================*/
-    function error ($errormsg, $lvl=E_USER_WARNING) {
+    function error ($errormsg, $lvl=E_USER_WARNING)
+    {
         // append PHP's error message if track_errors enabled
         if ( isset($php_errormsg) ) {
             $errormsg .= " ($php_errormsg)";
@@ -183,13 +190,13 @@ 
         $this->ERROR = $errormsg;
         if ( MAGPIE_DEBUG ) {
             trigger_error( $errormsg, $lvl);
-        }
-        else {
+        } else {
             error_log( $errormsg, 0);
         }
     }
 
-    function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+    function debug ($debugmsg, $lvl=E_USER_NOTICE)
+    {
         if ( MAGPIE_DEBUG ) {
             $this->error("MagpieRSS [debug] $debugmsg", $lvl);
         }