see issue #203

BlackCatDevelopment · Apr 14, 2014 · 9e614c8 · 9e614c8
1 parent a636a7c
commit 9e614c8
Show file tree

Hide file tree

Showing 16 changed files with 179 additions and 119 deletions.
diff --git a/upload/account/details.php b/upload/account/details.php
@@ -17,26 +17,26 @@
  *   @author          Black Cat Development
  *   @copyright       2013, Black Cat Development
  *   @link            http://blackcat-cms.org
- * @license         http://www.gnu.org/licenses/gpl.html
+ *   @license         http://www.gnu.org/licenses/gpl.html
  *   @category        CAT_Core
  *   @package         CAT_Core
  *
  */
 
-if (defined('CAT_PATH')) {	
-	include(CAT_PATH.'/framework/class.secure.php'); 
+if (defined('CAT_PATH')) {    
+    include(CAT_PATH.'/framework/class.secure.php'); 
 } else {
-	$root = "../";
-	$level = 1;
-	while (($level < 10) && (!file_exists($root.'/framework/class.secure.php'))) {
-		$root .= "../";
-		$level += 1;
-	}
-	if (file_exists($root.'/framework/class.secure.php')) { 
-		include($root.'/framework/class.secure.php'); 
-	} else {
-		trigger_error(sprintf("[ <b>%s</b> ] Can't include class.secure.php!", $_SERVER['SCRIPT_NAME']), E_USER_ERROR);
-	}
+    $root = "../";
+    $level = 1;
+    while (($level < 10) && (!file_exists($root.'/framework/class.secure.php'))) {
+        $root .= "../";
+        $level += 1;
+    }
+    if (file_exists($root.'/framework/class.secure.php')) { 
+        include($root.'/framework/class.secure.php'); 
+    } else {
+        trigger_error(sprintf("[ <b>%s</b> ] Can't include class.secure.php!", $_SERVER['SCRIPT_NAME']), E_USER_ERROR);
+    }
 }
 
 global $wb;
@@ -46,76 +46,74 @@
 $val = CAT_Helper_Validate::getInstance();
 
 // Get and sanitize entered values
-$display_name = strip_tags($val->sanitizePost( 'display_name', 'string', true ));
-$date_format  = ( CAT_Helper_DateTime::checkDateformat($val->sanitizePost( 'date_format', 'string', true )) === true )
-              ? $val->sanitizePost( 'date_format', 'string', true )
-              : NULL;
-$time_format  = ( CAT_Helper_DateTime::checkTimeformat($val->sanitizePost( 'time_format', 'string', true )) === true )
-              ? $val->sanitizePost( 'time_format', 'string', true )
-              : NULL;
-$language     = ( $wb->lang->checkLang($val->sanitizePost( 'language', 'string', true )) === true )
-              ? $val->sanitizePost( 'language', 'string', true )
-              : NULL;
+$display_name    = strip_tags($val->sanitizePost( 'display_name', 'string', true ));
+$date_format     = ( CAT_Helper_DateTime::checkDateformat($val->sanitizePost( 'date_format', 'string', true )) === true )
+                 ? $val->sanitizePost( 'date_format', 'string', true )
+                 : NULL;
+$time_format     = ( CAT_Helper_DateTime::checkTimeformat($val->sanitizePost( 'time_format', 'string', true )) === true )
+                 ? $val->sanitizePost( 'time_format', 'string', true )
+                 : NULL;
+$language        = ( $wb->lang->checkLang($val->sanitizePost( 'language', 'string', true )) === true )
+                 ? $val->sanitizePost( 'language', 'string', true )
+                 : NULL;
 $timezone_string = ( CAT_Helper_DateTime::checkTZ($val->sanitizePost('timezone_string')) === true )
                  ? $val->sanitizePost('timezone_string')
                  : DEFAULT_TIMEZONESTRING;
 
 // Update the database
 $database = new database();
-$query    = "UPDATE " . CAT_TABLE_PREFIX . "users
-			SET %s = '%s'
-			WHERE user_id = '%s'";
+$query    = "UPDATE `%susers` SET %s = '%s' WHERE user_id = '%s'";
 
 foreach ( array( 'display_name','date_format','time_format','language','timezone_string' ) as $key )
 {
     $item = ${$key};
     if ( $item !== NULL )
     {
-        $database->query( sprintf($query,$key,$item,$wb->get_user_id()) );
+        $database->query( sprintf($query,CAT_TABLE_PREFIX,$key,$item,$wb->get_user_id()) );
         if ( $database->is_error() )
         {
-	$wb->print_error( $database->get_error, 'index.php', false );
+            $wb->print_error( $database->get_error, 'index.php', false );
         }
     }
 }
 
 $wb->print_success( 'Details saved successfully',CAT_URL.'/account/preferences.php' );
 
-$_SESSION[ 'DISPLAY_NAME' ] = $display_name;
-$_SESSION[ 'LANGUAGE' ]     = $language;
+$_SESSION['DISPLAY_NAME'] = $display_name;
+$_SESSION['LANGUAGE']     = $language;
 // Update date format
 if ( $date_format != '' )
 {
-		$_SESSION[ 'DATE_FORMAT' ] = $date_format;
-		if ( isset( $_SESSION[ 'USE_DEFAULT_DATE_FORMAT' ] ) )
-		{
-			unset( $_SESSION[ 'USE_DEFAULT_DATE_FORMAT' ] );
-		}
+	$_SESSION['CAT_DATE_FORMAT'] = $date_format;
+	if ( isset( $_SESSION['USE_DEFAULT_DATE_FORMAT'] ) )
+	{
+		unset( $_SESSION['USE_DEFAULT_DATE_FORMAT'] );
+	}
 }
 else
 {
-		$_SESSION[ 'USE_DEFAULT_DATE_FORMAT' ] = true;
-		if ( isset( $_SESSION[ 'DATE_FORMAT' ] ) )
-		{
-			unset( $_SESSION[ 'DATE_FORMAT' ] );
-		}
+	$_SESSION['USE_DEFAULT_DATE_FORMAT'] = true;
+	if ( isset( $_SESSION['CAT_DATE_FORMAT'] ) )
+	{
+		unset( $_SESSION['CAT_DATE_FORMAT'] );
+	}
 }
 // Update time format
 if ( $time_format != '' )
 {
-		$_SESSION[ 'TIME_FORMAT' ] = $time_format;
-		if ( isset( $_SESSION[ 'USE_DEFAULT_TIME_FORMAT' ] ) )
-		{
-			unset( $_SESSION[ 'USE_DEFAULT_TIME_FORMAT' ] );
-		}
+	$_SESSION['CAT_TIME_FORMAT'] = $time_format;
+	if ( isset( $_SESSION['USE_DEFAULT_TIME_FORMAT'] ) )
+	{
+		unset( $_SESSION['USE_DEFAULT_TIME_FORMAT'] );
+	}
 }
 else
 {
-		$_SESSION[ 'USE_DEFAULT_TIME_FORMAT' ] = true;
-		if ( isset( $_SESSION[ 'TIME_FORMAT' ] ) )
-		{
-			unset( $_SESSION[ 'TIME_FORMAT' ] );
-		}
+	$_SESSION['USE_DEFAULT_TIME_FORMAT'] = true;
+	if ( isset( $_SESSION['CAT_TIME_FORMAT'] ) )
+	{
+		unset( $_SESSION['CAT_TIME_FORMAT'] );
+	}
 }
 // Update timezone
-$_SESSION[ 'TIMEZONE_STRING' ] = $timezone_string;
+$_SESSION['CAT_TIMEZONE_STRING'] = $timezone_string;
diff --git a/upload/account/preferences_form.php b/upload/account/preferences_form.php
@@ -50,19 +50,19 @@
 $submit_ok = false;
 $message   = false;
 $save      = $val->sanitizePost('save');
+$wbcompat  = (defined('WB2COMPAT') && WB2COMPAT===true) ? true : false;
 
 if ( $save && ( $save == 'account_settings' ) )
 {
-	$query   = "SELECT `password` from `" . CAT_TABLE_PREFIX . "users` where `user_id`='" . $user->get_user_id()
-             . "' AND `password`='" . md5( $val->sanitizePost('current_password') ) . "'";
-	$result  = $database->query( $query );
+	$query  = "SELECT `password` from `%susers` where `user_id`='%d' AND `password`='%s'";
+	$result = $database->query(sprintf($query,CAT_TABLE_PREFIX,$user->get_user_id(),md5($val->sanitizePost('current_password'))));
 	if ( $result->numRows() == 1 )
 	{
 		$submit_ok = true;
 	}
-	unset( $query );
-	unset( $result );
-	unset( $_POST['save'] );
+	unset($query);
+	unset($result);
+	unset($_POST['save']);
 }
 
 if (true === $submit_ok)
@@ -147,21 +147,21 @@
 		foreach($fields as $k=>$v)
             $_SESSION[ strtoupper($k) ] = $v;
 
-		$_SESSION['TIMEZONE_STRING'] = $timezone_string;
+		$_SESSION['CAT_TIMEZONE_STRING'] = $timezone_string;
 		date_default_timezone_set($timezone_string);
 
-		if ( $_SESSION['TIME_FORMAT'] != '' ) {
+		if ( $_SESSION['CAT_TIME_FORMAT'] != '' ) {
 			if(isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) unset($_SESSION['USE_DEFAULT_TIME_FORMAT']);
 		} else {
 			$_SESSION['USE_DEFAULT_TIME_FORMAT'] = true;
-			unset($_SESSION['TIME_FORMAT']);
+			unset($_SESSION['CAT_TIME_FORMAT']);
 		}
 
-		if ( $_SESSION['DATE_FORMAT'] != '' ) {
+		if ( $_SESSION['CAT_DATE_FORMAT'] != '' ) {
 			if(isset($_SESSION['USE_DEFAULT_DATE_FORMAT'])) unset($_SESSION['USE_DEFAULT_DATE_FORMAT']);
 		} else {
 			$_SESSION['USE_DEFAULT_DATE_FORMAT'] = true;
-			unset($_SESSION['DATE_FORMAT']);
+			unset($_SESSION['CAT_DATE_FORMAT']);
 		}
 	}
 
@@ -181,18 +181,18 @@
 $parser->setFallbackPath(dirname(__FILE__).'/templates/default'); // fallback to default dir
 $parser->output('account_preferences_form',
     array(
-        'languages' => $languages,
-        'timezones' => CAT_Helper_DateTime::getTimezones(),
-        'current_tz' => CAT_Helper_DateTime::getTimezone(),
-        'date_formats' => CAT_Helper_DateTime::getDateFormats(),
-        'current_df' => CAT_Helper_DateTime::getDefaultDateFormatShort(),
-        'time_formats' => CAT_Helper_DateTime::getTimeFormats(),
-        'current_tf' => CAT_Helper_DateTime::getDefaultTimeFormat(),
-        'PREFERENCES_URL' => PREFERENCES_URL,
-        'USER_ID' => $user->get_user_id(),
-        'DISPLAY_NAME' => $user->get_display_name(),
-        'GET_EMAIL' => $user->get_email(),
-        'RESULT_MESSAGE' => $message,
+        'languages'             => $languages,
+        'timezones'             => CAT_Helper_DateTime::getTimezones(),
+        'current_tz'            => CAT_Helper_DateTime::getTimezone(),
+        'date_formats'          => CAT_Helper_DateTime::getDateFormats(),
+        'current_df'            => CAT_Helper_DateTime::getDefaultDateFormatShort(),
+        'time_formats'          => CAT_Helper_DateTime::getTimeFormats(),
+        'current_tf'            => CAT_Helper_DateTime::getDefaultTimeFormat(),
+        'PREFERENCES_URL'       => PREFERENCES_URL,
+        'USER_ID'               => $user->get_user_id(),
+        'DISPLAY_NAME'          => $user->get_display_name(),
+        'GET_EMAIL'             => $user->get_email(),
+        'RESULT_MESSAGE'        => $message,
         'AUTH_MIN_LOGIN_LENGTH' => AUTH_MIN_LOGIN_LENGTH,
     )
 );

diff --git a/upload/backend/media/index.php b/upload/backend/media/index.php
@@ -105,8 +105,8 @@
         $tpl_data['files'][$counter]['FILETYPE']     = strtolower(pathinfo($file_path, PATHINFO_EXTENSION));
         $tpl_data['files'][$counter]['show_preview'] = ( in_array( strtolower($tpl_data['files'][$counter]['FILETYPE']), $allowed_img_types ) ) ? true : false;
         $tpl_data['files'][$counter]['FILESIZE']     = $dirh->getSize($file_path,true);
-        $tpl_data['files'][$counter]['FILEDATE']     = date (DEFAULT_DATE_FORMAT, filemtime($file_path));
-        $tpl_data['files'][$counter]['FILETIME']     = date (DEFAULT_TIME_FORMAT, filemtime($file_path));
+        $tpl_data['files'][$counter]['FILEDATE']     = date (CAT_DEFAULT_DATE_FORMAT, filemtime($file_path));
+        $tpl_data['files'][$counter]['FILETIME']     = date (CAT_DEFAULT_TIME_FORMAT, filemtime($file_path));
         $tpl_data['files'][$counter]['FULL_NAME']    = $file;
         $tpl_data['files'][$counter]['NAME']         = substr($file , 0 , -( strlen($tpl_data['files'][$counter]['FILETYPE'])+1 ) );
     }

diff --git a/upload/backend/pages/modify.php b/upload/backend/pages/modify.php
@@ -105,7 +105,7 @@
 
 $tpl_data['SECTION_BLOCKS'] = SECTION_BLOCKS;
 $tpl_data['SEC_ANCHOR']     = SEC_ANCHOR;
-$tpl_data['DATE_FORMAT']    = DATE_FORMAT;
+$tpl_data['DATE_FORMAT']    = CAT_DATE_FORMAT;
 
 $tpl_data['CUR_TAB']     = 'modify';
 $tpl_data['PAGE_HEADER'] = $backend->lang()->translate('Modify page');

diff --git a/upload/backend/preferences/ajax_save.php b/upload/backend/preferences/ajax_save.php
@@ -190,39 +190,38 @@
             $date_format = $val->sanitizePost('date_format');
 			if ( $date_format != '' )
 			{
-				$_SESSION['DATE_FORMAT'] = $date_format;
+				$_SESSION['CAT_DATE_FORMAT'] = $date_format;
 				if ( isset($_SESSION['USE_DEFAULT_DATE_FORMAT']) )
-				{
 					unset($_SESSION['USE_DEFAULT_DATE_FORMAT']);
 				}
-			}
 			else
 			{
 				$_SESSION['USE_DEFAULT_DATE_FORMAT']	= true;
-				if ( isset($_SESSION['DATE_FORMAT']) )
-				{
-					unset($_SESSION['DATE_FORMAT']);
-				}
+				if ( isset($_SESSION['CAT_DATE_FORMAT']) )
+					unset($_SESSION['CAT_DATE_FORMAT']);
 			}
 			// ====================== 
 			// ! Update time format   
 			// ====================== 
             $time_format = $val->sanitizePost('time_format');
 			if ( $time_format != '' )
 			{
-				$_SESSION['TIME_FORMAT']		= $time_format;
+				$_SESSION['CAT_TIME_FORMAT'] = $time_format;
 				if ( isset($_SESSION['USE_DEFAULT_TIME_FORMAT']) )
-				{
 					unset($_SESSION['USE_DEFAULT_TIME_FORMAT']);
 				}
-			}
 			else
 			{
 				$_SESSION['USE_DEFAULT_TIME_FORMAT'] = true;
-				if ( isset($_SESSION['TIME_FORMAT']) )
+				if ( isset($_SESSION['CAT_TIME_FORMAT']) )
+					unset($_SESSION['CAT_TIME_FORMAT']);
+			}
+
+            if( defined('WB2COMPAT') && WB2COMPAT === true )
 				{
-					unset($_SESSION['TIME_FORMAT']);
-				}
+                $wb2compat_format_map = CAT_Registry::get('WB2COMPAT_FORMAT_MAP');
+                $_SESSION['DATE_FORMAT'] = $wb2compat_format_map[$_SESSION['CAT_DATE_FORMAT']];
+                $_SESSION['TIME_FORMAT'] = $wb2compat_format_map[$_SESSION['CAT_TIME_FORMAT']];
 			}
 
 			// ==================== 

diff --git a/upload/backend/preferences/index.php b/upload/backend/preferences/index.php
@@ -114,7 +114,7 @@
 // =========================== 
 $DATE_FORMATS = CAT_Helper_DateTime::getDateFormats();
 $USE_DEFAULT  = $val->fromSession('USE_DEFAULT_DATE_FORMAT');
-$userformat   = $val->fromSession('DATE_FORMAT');
+$userformat   = $val->fromSession('CAT_DATE_FORMAT');
 $counter=0;
 foreach ( $DATE_FORMATS AS $format => $title )
 {
@@ -134,7 +134,7 @@
 // =========================== 
 $TIME_FORMATS = CAT_Helper_DateTime::getTimeFormats();
 $USE_DEFAULT  = $val->fromSession('USE_DEFAULT_TIME_FORMAT');
-$userformat   = $val->fromSession('TIME_FORMAT');
+$userformat   = $val->fromSession('CAT_TIME_FORMAT');
 $counter	= 0;
 foreach ( $TIME_FORMATS AS $format => $title )
 {

diff --git a/upload/backend/settings/functions.php b/upload/backend/settings/functions.php
@@ -220,7 +220,7 @@ function getDateformats() {
         $data[$counter] = array(
             'NAME'     => $title,
             'VALUE'    => ( $format != 'system_default' )    ? $format : '',
-            'SELECTED' => ( DEFAULT_DATE_FORMAT == $format ) ? true    : false
+            'SELECTED' => ( CAT_DEFAULT_DATE_FORMAT == $format ) ? true    : false
         );
         $counter++;
     }
@@ -334,15 +334,15 @@ function saveDatetime($backend) {
        ? $default_language
        : $old_settings['default_language'];
     // check date format
-    $settings['default_date_format']
+    $settings['cat_default_date_format']
        = CAT_Helper_DateTime::checkDateformat($val->sanitizePost('default_date_format'))
        ? $val->sanitizePost('default_date_format')
-       : $old_settings['default_date_format'];
+       : $old_settings['cat_default_date_format'];
     // check time format
-    $settings['default_time_format']
+    $settings['cat_default_time_format']
        = CAT_Helper_DateTime::checkTimeformat($val->sanitizePost('default_time_format'))
        ? $val->sanitizePost('default_time_format')
-       : $old_settings['default_date_format'];
+       : $old_settings['cat_default_time_format'];
     // check timezone string
     $settings['default_timezone_string']
        = CAT_Helper_DateTime::checkTZ($val->sanitizePost('default_timezone_string'))

diff --git a/upload/framework/CAT/Backend.php b/upload/framework/CAT/Backend.php
@@ -267,7 +267,7 @@ public function print_header()
                 'DD',
                 'MM'
             );
-            $tpl_data['DATE_FORMAT'] = str_replace($date_search, $date_replace, CAT_Registry::get('DATE_FORMAT'));
+            $tpl_data['DATE_FORMAT'] = str_replace($date_search, $date_replace, CAT_Registry::get('CAT_DATE_FORMAT'));
             $time_search             = array(
                 'H',
                 'i',