evolution-cms / evolution

manager/includes/messageCount.inc.php

Indentation +3 added lines, -3 removed lines

@@ -9,8 +9,8 @@
 
 // ajax response
 if (isset($_POST['updateMsgCount'])) {
-	header("Content-Type: application/json; charset=utf-8");
-	print $nrnewmessages.','.$nrtotalmessages;
-	exit;
+    header("Content-Type: application/json; charset=utf-8");
+    print $nrnewmessages.','.$nrtotalmessages;
+    exit;
 }
 ?>
\ No newline at end of file

manager/includes/error.class.inc.php

Indentation +59 added lines, -59 removed lines

@@ -5,72 +5,72 @@ 
 var $errorcode;
 var $errors = array();
 
-	function __construct() {
+    function __construct() {
 		
-		$_lang = $this->include_lang('errormsg');
+        $_lang = $this->include_lang('errormsg');
 		
-		$this->errors = array(
-		0	=>	$_lang["No errors occured."],
-		1	=>	$_lang["An error occured!"],
-		2	=>	$_lang["Document's ID not passed in request!"],
-		3	=>	$_lang["You don't have enough privileges for this action!"],
-		4	=>	$_lang["ID passed in request is NaN!"],
-		5	=>	$_lang["The document is locked!"],
-		6	=>	$_lang["Too many results returned from database!"],
-		7	=>	$_lang["Not enough/ no results returned from database!"],
-		8	=>	$_lang["Couldn't find parent document's name!"],
-		9	=>	$_lang["Logging error!"],
-		10	=>	$_lang["Table to optimise not found in request!"],
-		11	=>	$_lang["No settings found in request!"],
-		12	=>	$_lang["The document must have a title!"],
-		13	=>	$_lang["No user selected as recipient of this message!"],
-		14	=>	$_lang["No group selected as recipient of this message!"],
-		15	=>	$_lang["The document was not found!"],
+        $this->errors = array(
+        0	=>	$_lang["No errors occured."],
+        1	=>	$_lang["An error occured!"],
+        2	=>	$_lang["Document's ID not passed in request!"],
+        3	=>	$_lang["You don't have enough privileges for this action!"],
+        4	=>	$_lang["ID passed in request is NaN!"],
+        5	=>	$_lang["The document is locked!"],
+        6	=>	$_lang["Too many results returned from database!"],
+        7	=>	$_lang["Not enough/ no results returned from database!"],
+        8	=>	$_lang["Couldn't find parent document's name!"],
+        9	=>	$_lang["Logging error!"],
+        10	=>	$_lang["Table to optimise not found in request!"],
+        11	=>	$_lang["No settings found in request!"],
+        12	=>	$_lang["The document must have a title!"],
+        13	=>	$_lang["No user selected as recipient of this message!"],
+        14	=>	$_lang["No group selected as recipient of this message!"],
+        15	=>	$_lang["The document was not found!"],
 	
-		100 =>	$_lang["Double action (GET & POST) posted!"],
-		600 =>	$_lang["Document cannot be it's own parent!"],
-		601 =>	$_lang["Document's ID not passed in request!"],
-		602 =>	$_lang["New parent not set in request!"],
-		900 =>	$_lang["don't know the user!"], // don't know the user!
-		901 =>	$_lang["wrong password!"], // wrong password!
-		902 =>	$_lang["Due to too many failed logins, you have been blocked!"],
-		903 =>	$_lang["You are blocked and cannot log in!"],
-		904 =>	$_lang["You are blocked and cannot log in! Please try again later."],
-		905 =>	$_lang["The security code you entered didn't validate! Please try to login again!"]
-	);
-	}
+        100 =>	$_lang["Double action (GET & POST) posted!"],
+        600 =>	$_lang["Document cannot be it's own parent!"],
+        601 =>	$_lang["Document's ID not passed in request!"],
+        602 =>	$_lang["New parent not set in request!"],
+        900 =>	$_lang["don't know the user!"], // don't know the user!
+        901 =>	$_lang["wrong password!"], // wrong password!
+        902 =>	$_lang["Due to too many failed logins, you have been blocked!"],
+        903 =>	$_lang["You are blocked and cannot log in!"],
+        904 =>	$_lang["You are blocked and cannot log in! Please try again later."],
+        905 =>	$_lang["The security code you entered didn't validate! Please try to login again!"]
+    );
+    }
 
-	function include_lang($context='common') {
-		global $modx;
-		$_lang = array();
+    function include_lang($context='common') {
+        global $modx;
+        $_lang = array();
 		
-		$context = trim($context,'/');
-		if(strpos($context,'..')!==false) return;
+        $context = trim($context,'/');
+        if(strpos($context,'..')!==false) return;
 		
-		if($context === 'common')
-			$lang_path = MODX_MANAGER_PATH . 'includes/lang/';
-		else
-			$lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
-		include_once($lang_path . 'english.inc.php');
-		$manager_language = $modx->config['manager_language'];
-		if(is_file("{$lang_path}{$manager_language}.inc.php"))
-			include_once("{$lang_path}{$manager_language}.inc.php");
-		return $_lang;
-	}
+        if($context === 'common')
+            $lang_path = MODX_MANAGER_PATH . 'includes/lang/';
+        else
+            $lang_path = MODX_MANAGER_PATH . "includes/lang/{$context}/";
+        include_once($lang_path . 'english.inc.php');
+        $manager_language = $modx->config['manager_language'];
+        if(is_file("{$lang_path}{$manager_language}.inc.php"))
+            include_once("{$lang_path}{$manager_language}.inc.php");
+        return $_lang;
+    }
 	
-	function setError($errorcode, $custommessage=""){
-		$this->errorcode=$errorcode;
-		$this->errormessage=$this->errors[$errorcode];
-		if($custommessage!="") {
-			$this->errormessage=$custommessage;
-		}
-	}	
+    function setError($errorcode, $custommessage=""){
+        $this->errorcode=$errorcode;
+        $this->errormessage=$this->errors[$errorcode];
+        if($custommessage!="") {
+            $this->errormessage=$custommessage;
+        }
+    }	
 	
-	function getError() {
-		return $this->errorcode;
-	}
+    function getError() {
+        return $this->errorcode;
+    }
 	
-	function dumpError(){
+    function dumpError(){
 ?>
 	<html>
 	<head>
@@ -88,7 +88,7 @@ 
 	</body>
 	</html>
 <?php
-		exit;
-	}
+        exit;
+    }
 }
 ?>
\ No newline at end of file

manager/includes/user_settings.inc.php

Indentation +13 added lines, -13 removed lines

@@ -3,24 +3,24 @@
 
 // START HACK
 if (isset ($modx)) {
-	$user_id = $modx->getLoginUserID();
+    $user_id = $modx->getLoginUserID();
 } else {
-	$user_id = $_SESSION['mgrInternalKey'];
+    $user_id = $_SESSION['mgrInternalKey'];
 }
 // END HACK
 
 if (!empty($user_id)) {
-	// Raymond: grab the user settings from the database.
-	$rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('user_settings'), "user=".$modx->getLoginUserID());
+    // Raymond: grab the user settings from the database.
+    $rs = $modx->db->select('setting_name, setting_value', $modx->getFullTableName('user_settings'), "user=".$modx->getLoginUserID());
 
-	$which_browser_default = $which_browser;
-	while ($row = $modx->db->getRow($rs)) {
-		if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
-		$settings[$row['setting_name']] = $row['setting_value'];
-		if (isset($modx->config)) {
-			$modx->config[$row['setting_name']] = $row['setting_value'];
-		}
-	}
-	extract($settings, EXTR_OVERWRITE);
+    $which_browser_default = $which_browser;
+    while ($row = $modx->db->getRow($rs)) {
+        if($row['setting_name'] == 'which_browser' && $row['setting_value'] == 'default') $row['setting_value'] = $which_browser_default;
+        $settings[$row['setting_name']] = $row['setting_value'];
+        if (isset($modx->config)) {
+            $modx->config[$row['setting_name']] = $row['setting_value'];
+        }
+    }
+    extract($settings, EXTR_OVERWRITE);
 }
 ?>
\ No newline at end of file

manager/includes/tmplvars.commands.inc.php

Indentation +19 added lines, -19 removed lines

@@ -119,8 +119,8 @@ 
 
 function ProcessFile($file) {
     // get the file
-	$buffer = @file_get_contents($file);
-	if ($buffer===false) $buffer = " Could not retrieve document '$file'.";
+    $buffer = @file_get_contents($file);
+    if ($buffer===false) $buffer = " Could not retrieve document '$file'.";
     return $buffer;
 }
 
@@ -144,21 +144,21 @@ 
 // Parse MODX Template-Variables
 function parseTvValues($param, $tvsArray)
 {
-	global $modx;
-	$tvsArray = is_array($modx->documentObject) ? array_merge($tvsArray, $modx->documentObject) : $tvsArray;
-	if (strpos($param, '[*') !== false) {
-		$matches = $modx->getTagsFromContent($param, '[*', '*]');
-		foreach ($matches[0] as $i=>$match) {
-			if(isset($tvsArray[ $matches[1][$i] ])) {
-				if(is_array($tvsArray[ $matches[1][$i] ])) {
-					$value = $tvsArray[$matches[1][$i]]['value'];
-					$value = $value === '' ? $tvsArray[$matches[1][$i]]['default_text'] : $value;
-				} else {
-					$value = $tvsArray[ $matches[1][$i] ];
-				}
-				$param = str_replace($match, $value, $param);
-			}
-		}
-	}
-	return $param;
+    global $modx;
+    $tvsArray = is_array($modx->documentObject) ? array_merge($tvsArray, $modx->documentObject) : $tvsArray;
+    if (strpos($param, '[*') !== false) {
+        $matches = $modx->getTagsFromContent($param, '[*', '*]');
+        foreach ($matches[0] as $i=>$match) {
+            if(isset($tvsArray[ $matches[1][$i] ])) {
+                if(is_array($tvsArray[ $matches[1][$i] ])) {
+                    $value = $tvsArray[$matches[1][$i]]['value'];
+                    $value = $value === '' ? $tvsArray[$matches[1][$i]]['default_text'] : $value;
+                } else {
+                    $value = $tvsArray[ $matches[1][$i] ];
+                }
+                $param = str_replace($match, $value, $param);
+            }
+        }
+    }
+    return $param;
 }
\ No newline at end of file

manager/includes/secure_mgr_documents.inc.php

Indentation +11 added lines, -11 removed lines

@@ -11,19 +11,19 @@
  */
 
 function secureMgrDocument($docid='') {
-	global $modx;
+    global $modx;
 		
-	$modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privatemgr = 1"));
-	$rs = $modx->db->select(
-		'DISTINCT sc.id',
-		$modx->getFullTableName("site_content")." sc
+    $modx->db->update('privatemgr = 0', $modx->getFullTableName("site_content"), ($docid>0 ? "id='$docid'":"privatemgr = 1"));
+    $rs = $modx->db->select(
+        'DISTINCT sc.id',
+        $modx->getFullTableName("site_content")." sc
 			LEFT JOIN ".$modx->getFullTableName("document_groups")." dg ON dg.document = sc.id
 			LEFT JOIN ".$modx->getFullTableName("membergroup_access")." mga ON mga.documentgroup = dg.document_group",
-		($docid>0 ? " sc.id='{$docid}' AND ":"")."mga.id>0"
-		);
-	$ids = $modx->db->getColumn("id",$rs);
-	if(count($ids)>0) {
-		$modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");	
-	}
+        ($docid>0 ? " sc.id='{$docid}' AND ":"")."mga.id>0"
+        );
+    $ids = $modx->db->getColumn("id",$rs);
+    if(count($ids)>0) {
+        $modx->db->update('privatemgr = 1', $modx->getFullTableName("site_content"), "id IN (".implode(", ",$ids).")");	
+    }
 }
 ?>
\ No newline at end of file

manager/includes/sysalert.display.inc.php

Indentation +20 added lines, -20 removed lines

@@ -1,30 +1,30 @@ 
 <?php
 
-	/**
-	 *	System Alert Message Queue Display file
-	 *	Written By Raymond Irving, April, 2005
-	 *
-	 *	Used to display system alert messages inside the browser
-	 *
-	 */
+    /**
+     *	System Alert Message Queue Display file
+     *	Written By Raymond Irving, April, 2005
+     *
+     *	Used to display system alert messages inside the browser
+     *
+     */
 
-	require_once(dirname(__FILE__).'/protect.inc.php');
+    require_once(dirname(__FILE__).'/protect.inc.php');
 
-	$sysMsgs = "";
-	$limit = count($SystemAlertMsgQueque);
-	for($i=0;$i<$limit;$i++) {
-		$sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
-	}
-	// reset message queque
-	unset($_SESSION['SystemAlertMsgQueque']);
-	$_SESSION['SystemAlertMsgQueque'] = array();
-	$SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
+    $sysMsgs = "";
+    $limit = count($SystemAlertMsgQueque);
+    for($i=0;$i<$limit;$i++) {
+        $sysMsgs .= $SystemAlertMsgQueque[$i]."<hr sys/>";
+    }
+    // reset message queque
+    unset($_SESSION['SystemAlertMsgQueque']);
+    $_SESSION['SystemAlertMsgQueque'] = array();
+    $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
-	if($sysMsgs!="") {
+    if($sysMsgs!="") {
 ?>
 
 <?php // fetch the styles
-	echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />';
+    echo '<link rel="stylesheet" type="text/css" href="'.MODX_MANAGER_URL.'media/style/'.$manager_theme.'/style.css'.'" />';
 ?>
 <script type="text/javascript">
 // <![CDATA[
@@ -42,5 +42,5 @@ 
 // ]]>
 </script>
 <?php
-	}
+    }
 ?>
\ No newline at end of file

manager/includes/active_user_locks.php

Indentation +1 added lines, -1 removed lines

@@ -21,5 +21,5 @@
 if($ok) {
     echo '{status:"ok"}';
 } else {
-  echo '{status:"null"}';
+    echo '{status:"null"}';
 }

manager/includes/config_check.inc.php

Indentation +16 added lines, -16 removed lines

@@ -3,14 +3,14 @@ 
 
 // PROCESSOR FIRST
 if($_SESSION['mgrRole'] == 1) {
-	if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
-		$current = $modx->manager->getSystemChecksum($modx->config['check_files_onlogin']);
-		if(!empty($current)) {
-			$modx->manager->setSystemChecksum($current);
-			$modx->clearCache('full');
-			$modx->config['sys_files_checksum'] = $current;
-		};
-	}
+    if($_REQUEST['b'] == 'resetSysfilesChecksum' && $modx->hasPermission('settings')) {
+        $current = $modx->manager->getSystemChecksum($modx->config['check_files_onlogin']);
+        if(!empty($current)) {
+            $modx->manager->setSystemChecksum($current);
+            $modx->clearCache('full');
+            $modx->config['sys_files_checksum'] = $current;
+        };
+    }
 }
 
 // NOW CHECK CONFIG
@@ -18,15 +18,15 @@ 
 
 $sysfiles_check = $modx->manager->checkSystemChecksum();
 if ($sysfiles_check!=='0'){
-      $warningspresent = 1;
-      $warnings[] = array($_lang['configcheck_sysfiles_mod']);
+        $warningspresent = 1;
+        $warnings[] = array($_lang['configcheck_sysfiles_mod']);
 }
 
 if (is_writable("includes/config.inc.php")){
     // Warn if world writable
     if(@fileperms('includes/config.inc.php') & 0x0002) {
-      $warningspresent = 1;
-      $warnings[] = array($_lang['configcheck_configinc']);
+        $warningspresent = 1;
+        $warnings[] = array($_lang['configcheck_configinc']);
     }
 }
 
@@ -177,10 +177,10 @@ 
             break;
         case $_lang['configcheck_sysfiles_mod']:
             $warnings[$i][1] = $_lang["configcheck_sysfiles_mod_msg"];
-			$warnings[$i][2] = '<ul><li>'. join('</li><li>', $sysfiles_check) .'</li></ul>';
-			if($modx->hasPermission('settings')) {
-				$warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
-			}
+            $warnings[$i][2] = '<ul><li>'. join('</li><li>', $sysfiles_check) .'</li></ul>';
+            if($modx->hasPermission('settings')) {
+                $warnings[$i][2] .= '<ul class="actionButtons" style="float:right"><li><a href="index.php?a=2&b=resetSysfilesChecksum" onclick="return confirm(\'' . $_lang["reset_sysfiles_checksum_alert"] . '\')">' . $_lang["reset_sysfiles_checksum_button"] . '</a></li></ul>';
+            }
             if(!$_SESSION["mgrConfigCheck"]) $modx->logEvent(0,3,$warnings[$i][1]." ".join(', ',$sysfiles_check),$_lang['configcheck_sysfiles_mod']);
             break;
         case $_lang['configcheck_lang_difference'] :

manager/includes/template.parser.class.inc.php

Indentation +151 added lines, -151 removed lines

@@ -9,178 +9,178 @@
 

 Class TemplateParser {

 

-	function __construct() {

-	}

-

-	/**

-	 * @param array $config [action, tabs, toArray]

-	 * @param array $data

-	 * @return string

-	 */

-	public function output($config = array(), $data = array()) {

-		global $modx;

-

-		$output = '';

-		$action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');

-		$tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';

-

-		if($action) {

-			$sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name

+    function __construct() {

+    }

+

+    /**

+     * @param array $config [action, tabs, toArray]

+     * @param array $data

+     * @return string

+     */

+    public function output($config = array(), $data = array()) {

+        global $modx;

+

+        $output = '';

+        $action = !empty($config['action']) ? $config['action'] : (!empty($_REQUEST['a']) ? $_REQUEST['a'] : '');

+        $tab = isset($config['tab']) ? ' AND tab IN(' . $config['tab'] . ')' : '';

+

+        if($action) {

+            $sql = $modx->db->query('SELECT t1.*, IF(t1.alias=\'\',t1.name,t1.alias) AS alias, t2.category AS category_name

 			FROM ' . $modx->getFullTableName('system_templates') . ' AS t1

 			INNER JOIN ' . $modx->getFullTableName('categories') . ' AS t2 ON t2.id=t1.category

 			WHERE t1.action IN(' . $action . ') ' . $tab . '

 			ORDER BY t1.tab ASC, t1.rank ASC');

 

-			if($modx->db->getRecordCount($sql)) {

-				$tabs = array();

-				while($row = $modx->db->getRow($sql)) {

-					if(!$row['value'] && !empty($data[$row['name']])) {

-						$row['value'] = $data[$row['name']];

-					}

-					$tabs[$row['tab']]['category_name'] = $row['category_name'];

-					$tabs[$row['tab']][$row['name']] = TemplateParser::render($row);

-				}

-

-				if(!empty($config['toArray'])) {

-					$output = $tabs;

-				} else {

-					$output .= '<div class="tab-pane" id="pane_' . $action . '">';

-					$output .= '

+            if($modx->db->getRecordCount($sql)) {

+                $tabs = array();

+                while($row = $modx->db->getRow($sql)) {

+                    if(!$row['value'] && !empty($data[$row['name']])) {

+                        $row['value'] = $data[$row['name']];

+                    }

+                    $tabs[$row['tab']]['category_name'] = $row['category_name'];

+                    $tabs[$row['tab']][$row['name']] = TemplateParser::render($row);

+                }

+

+                if(!empty($config['toArray'])) {

+                    $output = $tabs;

+                } else {

+                    $output .= '<div class="tab-pane" id="pane_' . $action . '">';

+                    $output .= '

 					<script type="text/javascript">

 						var pane_' . $action . ' = new WebFXTabPane(document.getElementById("pane_' . $action . '"), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');

 					</script>';

 

-					foreach($tabs as $idTab => $tab) {

-						$output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';

-						$output .= '

+                    foreach($tabs as $idTab => $tab) {

+                        $output .= '<div class="tab-page" id="tab_' . $action . '_' . $idTab . '">';

+                        $output .= '

 						<h2 class="tab">' . (!empty($config['tabs'][$idTab]) ? $config['tabs'][$idTab] : $tab['category_name']) . '</h2>

 						<script type="text/javascript">pane_' . $action . '.addTabPage(document.getElementById("tab_' . $action . '_' . $idTab . '"));</script>';

-						unset($tab['category_name']);

-						foreach($tab as $item) {

-							$output .= $item;

-						}

-						$output .= '</div>';

-					}

-					$output .= '</div>';

-				}

-			}

-		}

-

-		return $output;

-	}

-

-	private function render($data) {

-		global $modx, $_lang, $_country_lang;

-

-		$data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

-		$data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $_POST[$data['name']][$data['value']] : (isset($data['value']) ? $modx->htmlspecialchars($data['value']) : ''));

-		$data['readonly'] = ($data['readonly'] ? ' readonly' : '');

-

-		$output = '';

-		$output .= '<div class="form-group row">';

-

-		switch($data['type']) {

-

-			case 'text':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

+                        unset($tab['category_name']);

+                        foreach($tab as $item) {

+                            $output .= $item;

+                        }

+                        $output .= '</div>';

+                    }

+                    $output .= '</div>';

+                }

+            }

+        }

+

+        return $output;

+    }

+

+    private function render($data) {

+        global $modx, $_lang, $_country_lang;

+

+        $data['lang.name'] = (isset($_lang[$data['alias']]) ? $_lang[$data['alias']] : $data['alias']);

+        $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $_POST[$data['name']][$data['value']] : (isset($data['value']) ? $modx->htmlspecialchars($data['value']) : ''));

+        $data['readonly'] = ($data['readonly'] ? ' readonly' : '');

+

+        $output = '';

+        $output .= '<div class="form-group row">';

+

+        switch($data['type']) {

+

+            case 'text':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<input type="text" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				$output .= $data['content'];

-				$output .= '</div>';

+                $output .= $data['content'];

+                $output .= '</div>';

 

-				break;

+                break;

 

-			case 'textarea':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

+            case 'textarea':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<textarea name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;"[+readonly+]>[+value+]</textarea>';

-				$output .= $data['content'];

-				$output .= '</div>';

+                $output .= $data['content'];

+                $output .= '</div>';

 

-				break;

+                break;

 

-			case 'date':

-				$data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $modx->toDateFormat($_POST[$data['name']][$data['value']]) : (isset($data['value']) ? $modx->toDateFormat($data['value']) : ''));

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

+            case 'date':

+                $data['value'] = (isset($_POST[$data['name']][$data['value']]) ? $modx->toDateFormat($_POST[$data['name']][$data['value']]) : (isset($data['value']) ? $modx->toDateFormat($data['value']) : ''));

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>

 					<div class="col-sm-7">

 					<input type="text" name="[+name+]" class="form-control DatePicker" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'select':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';

-				if($data['name'] == 'country' && isset($_country_lang)) {

-					$chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];

-					$output .= '<option value=""' . (!isset($chosenCountry) ? ' selected' : '') . '>&nbsp;</option>';

-					foreach($_country_lang as $key => $value) {

-						$output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>';

-					}

-				} else {

-					if($data['elements']) {

-						$elements = explode('||', $data['elements']);

-						foreach($elements as $key => $value) {

-							$value = explode('==', $value);

-							$output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

-						}

-					}

-				}

-				$output .= '</select>';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'checkbox':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

-					$elements = explode('||', $data['elements']);

-					foreach($elements as $key => $value) {

-						$value = explode('==', $value);

-						$output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

-					}

-				}

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'radio':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

-				if($data['elements']) {

-					$elements = explode('||', $data['elements']);

-					foreach($elements as $key => $value) {

-						$value = explode('==', $value);

-						$output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

-					}

-				}

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-

-			case 'custom':

-				$output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

-				$output .= '<div class="col-sm-7">';

-				$output .= $data['content'];

-				$output .= '</div>';

-

-				break;

-		}

-

-		$output .= '</div>';

-

-		$output = $modx->parseText($output, $data);

-

-		return $output;

-	}

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'select':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= '<select name="[+name+]" class="form-control" id="[+name+]" onChange="documentDirty=true;">';

+                if($data['name'] == 'country' && isset($_country_lang)) {

+                    $chosenCountry = isset($_POST['country']) ? $_POST['country'] : $data['country'];

+                    $output .= '<option value=""' . (!isset($chosenCountry) ? ' selected' : '') . '>&nbsp;</option>';

+                    foreach($_country_lang as $key => $value) {

+                        $output .= '<option value="' . $key . '"' . (isset($chosenCountry) && $chosenCountry == $key ? ' selected' : '') . '>' . $value . '</option>';

+                    }

+                } else {

+                    if($data['elements']) {

+                        $elements = explode('||', $data['elements']);

+                        foreach($elements as $key => $value) {

+                            $value = explode('==', $value);

+                            $output .= '<option value="' . $value[1] . '">' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]) . '</option>';

+                        }

+                    }

+                }

+                $output .= '</select>';

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'checkbox':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= '<input type="checkbox" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

+                if($data['elements']) {

+                    $elements = explode('||', $data['elements']);

+                    foreach($elements as $key => $value) {

+                        $value = explode('==', $value);

+                        $output .= '<br /><input type="checkbox" name="' . $value[0] . '" class="form-control" id="' . $value[0] . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

+                    }

+                }

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'radio':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= '<input type="radio" name="[+name+]" class="form-control" id="[+name+]" value="[+value+]" onChange="documentDirty=true;"[+readonly+] />';

+                if($data['elements']) {

+                    $elements = explode('||', $data['elements']);

+                    foreach($elements as $key => $value) {

+                        $value = explode('==', $value);

+                        $output .= '<br /><input type="radio" name="[+name+]" class="form-control" id="[+name+]_' . $key . '" value="' . $value[1] . '" onChange="documentDirty=true;"[+readonly+] /> ' . (isset($_lang[$value[0]]) ? $_lang[$value[0]] : $value[0]);

+                    }

+                }

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+

+            case 'custom':

+                $output .= '<label class="col-sm-3" for="[+name+]">[+lang.name+]</label>';

+                $output .= '<div class="col-sm-7">';

+                $output .= $data['content'];

+                $output .= '</div>';

+

+                break;

+        }

+

+        $output .= '</div>';

+

+        $output = $modx->parseText($output, $data);

+

+        return $output;

+    }

 

 }