diff --git a/.gitignore b/.gitignore index 68720571..d0a7717c 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,5 @@ writeable/templates_compile/* # htaccess or generic index file. app/cache/* !app/cache/.htaccess -!app/cache/index.html \ No newline at end of file +!app/cache/index.html +writeable/routes.php diff --git a/.htaccess b/.htaccess index 22cf4de5..834f1c90 100644 --- a/.htaccess +++ b/.htaccess @@ -1,31 +1,32 @@ - RewriteEngine On - Options +FollowSymlinks + RewriteEngine On + RewriteBase / + Options +FollowSymlinks - - Order Allow,Deny - Deny from all - + + Order Allow,Deny + Deny from all + - #Removes access to the system folder by users. - #Additionally this will allow you to create a System.php controller, - #previously this would not have been possible. - #'system' can be replaced if you have renamed your system folder. - RewriteCond %{REQUEST_URI} ^system.* - RewriteRule ^(.*)$ index.php?/$1 [L] + #Removes access to the system folder by users. + #Additionally this will allow you to create a System.php controller, + #previously this would not have been possible. + #'system' can be replaced if you have renamed your system folder. + RewriteCond %{REQUEST_URI} ^system.* + RewriteRule ^(.*)$ index.php?/$1 [L] - #Checks to see if the user is attempting to access a valid file, - #such as an image or css document, if this isn't true it sends the - #request to index.php - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule ^(.*)$ index.php?/$1 [L] + #Checks to see if the user is attempting to access a valid file, + #such as an image or css document, if this isn't true it sends the + #request to index.php + RewriteCond %{REQUEST_FILENAME} !-f + RewriteCond %{REQUEST_FILENAME} !-d + RewriteRule ^(.*)$ index.php?/$1 [L] - # If we don't have mod_rewrite installed, all 404's - # can be sent to index.php, and everything works as normal. - # Submitted by: ElliotHaughin + # If we don't have mod_rewrite installed, all 404's + # can be sent to index.php, and everything works as normal. + # Submitted by: ElliotHaughin - ErrorDocument 404 index.php + ErrorDocument 404 index.php diff --git a/1.htaccess b/1.htaccess index ddc22a51..3214835b 100644 --- a/1.htaccess +++ b/1.htaccess @@ -1,7 +1,8 @@ RewriteEngine On + RewriteBase / Options +FollowSymlinks - + Order Allow,Deny Deny from all diff --git a/README.md b/README.md index 9bcd2cf2..0db7db61 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ Hero Please ensure that your hosting environment meets the following specifications: -* PHP 5.1+ -* One available MySQL 3.23+ database. +* PHP 5.6+ and PHP 7.0+ +* One available MySQL database with mysqli or mysqlnd driver. * Apache or Apache-like server that can parse .htaccess files with mod_rewrite rules. * Ability to create one cronjob or scheduled process. diff --git a/app/config/database.format.php b/app/config/database.format.php index 7d5342d5..73078b48 100644 --- a/app/config/database.format.php +++ b/app/config/database.format.php @@ -38,10 +38,10 @@ $active_record = TRUE; $db['default']['hostname'] = "localhost"; -$db['default']['username'] = "root"; -$db['default']['password'] = ''; +$db['default']['username'] = "hero"; +$db['default']['password'] = 'framework'; $db['default']['database'] = "hero"; -$db['default']['dbdriver'] = "mysql"; +$db['default']['dbdriver'] = "mysqli"; $db['default']['dbprefix'] = ""; $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; @@ -52,4 +52,4 @@ /* End of file database.php */ -/* Location: ./app/config/database.php */ \ No newline at end of file +/* Location: ./app/config/database.php */ diff --git a/app/controllers/admincp/dashboard.php b/app/controllers/admincp/dashboard.php index 82374d17..d9256e30 100644 --- a/app/controllers/admincp/dashboard.php +++ b/app/controllers/admincp/dashboard.php @@ -11,6 +11,7 @@ */ class Dashboard extends Admincp_Controller { + function __construct() { parent::__construct(); @@ -91,8 +92,9 @@ function index() { // system stats $system = array(); - $system['PHP'] = phpversion(); - $system['MySQL'] = mysql_get_server_info(); + $system['PHP'] = explode('~',phpversion())[0]; + $this->load->database(); + $system['MySQL'] = $this->db->conn_id->server_info; $system[$this->config->item('app_name')] = $this->config->item('app_version'); $system['CodeIgniter'] = CI_VERSION; $system['Theme'] = setting('theme'); diff --git a/app/controllers/install.php b/app/controllers/install.php index c70fc140..6ab5d582 100644 --- a/app/controllers/install.php +++ b/app/controllers/install.php @@ -1,4 +1,7 @@ -input->post('base_url') != '') { // we have a submission - + $this->load->model('install_model'); + // validate MySQL info - $valid_mysql = FALSE; - if ($dbh = @mysql_connect($this->input->post('db_host'),$this->input->post('db_user'),$this->input->post('db_pass'))) - { - if (@mysql_select_db($this->input->post('db_name'), $dbh)) - { - $valid_mysql = TRUE; - } - } + $valid_mysql = $this->install_model->validate_creds(); if ($valid_mysql == FALSE) { $error_mysql = TRUE; @@ -93,39 +90,7 @@ function index() { // import initial database structure // note - all update files will be run before the next step loads (because auto_updater will be invoked) - $structure = read_file(APPPATH . 'updates/install.php'); - $structure = str_replace('','',$structure); - - // break into newlines - $structure = explode("\n",$structure); - - // run mysql queries - $query = ""; - $querycount = 0; - foreach ($structure as $sql_line) - { - if (trim($sql_line) != "" and substr($sql_line,0,2) != "--") - { - $query .= $sql_line; - if (substr(trim($query), -1, 1) == ";") - { - // this query is finished, execute it - if (@mysql_query($query, $dbh)) - { - $query = ""; - $querycount++; - } - else { - show_error('There was a critical error importing the initial database structure. Please contact support.

Query:

' . $query); - die(); - } - } - } - } - - // update settings - mysql_query('UPDATE `settings` SET `setting_value`=\'' . $this->input->post('site_name') . '\' WHERE `setting_name`=\'site_name\' or `setting_name`=\'email_name\''); - mysql_query('UPDATE `settings` SET `setting_value`=\'' . $this->input->post('site_email') . '\' WHERE `setting_name`=\'site_email\''); + $this->install_model->run_setup_queries(); // send to administrator account setup if (strstr($this->current_url(),'/index')) { @@ -143,18 +108,18 @@ function index() { // which folders/files should be writeable? $file_permissions = array( - str_replace('system/','',BASEPATH) . 'writeable', - APPPATH . 'config', - APPPATH . 'config/config.php' - ); + str_replace('system/','',BASEPATH) . 'writeable', + APPPATH . 'config', + APPPATH . 'config/config.php' + ); $file_permission_errors = array(); foreach ($file_permissions as $file) { if (!is_writable($file)) { $file_permission_errors[] = array( - 'file' => $file, - 'folder' => (is_dir($file)) ? TRUE : FALSE - ); + 'file' => $file, + 'folder' => (is_dir($file)) ? TRUE : FALSE + ); } } @@ -214,6 +179,8 @@ function current_url() { function admin () { $this->load->library('session'); $this->load->helper('url'); + $this->load->library('auto_updater'); + if ($this->input->post('username')) { if ($this->input->post('password') != $this->input->post('password2')) { @@ -275,12 +242,12 @@ function complete () { write_file(APPPATH . 'config/installed.php', '','w'); $vars = array( - 'username' => $this->session->userdata('username'), - 'email' => $this->session->userdata('email'), - 'password' => $this->session->userdata('password'), - 'cron_key' => $this->config->item('cron_key'), - 'cp_link' => site_url('admincp') - ); + 'username' => $this->session->userdata('username'), + 'email' => $this->session->userdata('email'), + 'password' => $this->session->userdata('password'), + 'cron_key' => $this->config->item('cron_key'), + 'cp_link' => site_url('admincp') + ); $this->load->view(branded_view('install/complete.php'), $vars); } diff --git a/app/core/MY_Loader.php b/app/core/MY_Loader.php index 3841ea70..38011e66 100644 --- a/app/core/MY_Loader.php +++ b/app/core/MY_Loader.php @@ -14,7 +14,7 @@ function __construct () { * Customized loader methods, which will use define_module * to load the module definition file if necessary. */ - function helper ($helper) { + function helper ($helper = array()) { if (!is_array($helper)) { self::define_module($helper); } @@ -22,7 +22,7 @@ function helper ($helper) { return parent::helper($helper); } - function library ($library, $params = NULL, $object_name = NULL) { + function library ($library = '', $params = NULL, $object_name = NULL) { if (!is_array($library)) { self::define_module($library); } @@ -54,7 +54,7 @@ function plugin ($plugin) { * @param string $path The path to the file being loaded, e.g., "settings/settings_model.php" * */ - function define_module ($path) { + public function define_module ($path) { if (strpos($path, '/') !== FALSE) { // normally, we'd do this in the constructor, but that way left us with // some issues in that module_model was NULL in certain instances @@ -111,4 +111,4 @@ function define_module ($path) { } } } -} \ No newline at end of file +} diff --git a/app/helpers/admincp/get_notices_helper.php b/app/helpers/admincp/get_notices_helper.php index 18d482e2..6f64842f 100644 --- a/app/helpers/admincp/get_notices_helper.php +++ b/app/helpers/admincp/get_notices_helper.php @@ -4,17 +4,21 @@ function get_notices () { $CI =& get_instance(); $errors = $CI->notices->GetErrors(); - $notices = $CI->notices->GetNotices(); $return = ''; - while (list(,$error) = each($errors)) { - $return .= '
' . $error . '
'; + $eCount = count($errors); + for($i = 0; $i < $eCount; $i++){ + $return .= '
' . $errors[$i] . '
'; } + unset($eCount); reset($errors); - - while (list(,$notice) = each($notices)) { - $return .= '
' . $notice . '
'; + + $notices = $CI->notices->GetNotices(); + $nCount = count($notices); + for($i = 0; $i < $nCount; $i++){ + $return .= '
' . $notices[$i] . '
'; } + unset($nCount); reset($notices); return $return; diff --git a/app/helpers/file_extension_helper.php b/app/helpers/file_extension_helper.php index 357a5d9a..a156c463 100644 --- a/app/helpers/file_extension_helper.php +++ b/app/helpers/file_extension_helper.php @@ -13,5 +13,6 @@ * @author Electric Function, Inc. */ function file_extension ($file) { - return strtolower(end(explode(".", $file))); + $exFile = explode('.', $file); + return strtolower(end($exFile)); } \ No newline at end of file diff --git a/app/helpers/get_available_image_library_helper.php b/app/helpers/get_available_image_library_helper.php index 7fc2be9d..13b8a774 100644 --- a/app/helpers/get_available_image_library_helper.php +++ b/app/helpers/get_available_image_library_helper.php @@ -20,8 +20,7 @@ function get_available_image_library () { if (class_exists('Imagick')) { return 'ImageMagick'; - } - elseif (function_exists('imagecreatetruecolor')) { + } elseif (function_exists('imagecreatetruecolor')) { $gd = gd_info(); // get the pure version number diff --git a/app/helpers/template_files_helper.php b/app/helpers/template_files_helper.php index 384dffb9..03ed4325 100644 --- a/app/helpers/template_files_helper.php +++ b/app/helpers/template_files_helper.php @@ -26,8 +26,11 @@ function parse_template_files_array ($files, $return = array(), $prefix = '') { foreach ($files as $key => $file) { - $extension = (!is_array($file) and strpos($file, '.') !== FALSE) ? end(explode('.', $file)) : ''; - + $extension = ''; + if (!is_array($file) and strpos($file, '.') !== FALSE){ + $exFile = explode('.', $file); + $extension = end($exFile); + } if (is_array($file)) { $return = array_merge($return,parse_template_files_array($file, $return, $prefix . $key . '/')); } diff --git a/app/libraries/MY_Email.php b/app/libraries/MY_Email.php index 85e31dec..a6a9db2e 100644 --- a/app/libraries/MY_Email.php +++ b/app/libraries/MY_Email.php @@ -35,7 +35,7 @@ function message ($message) { parent::message($message); } - function from ($from_email, $from_name) { + function from ($from_email, $from_name='') { $this->_plaintext_from_name = $from_name; $this->_plaintext_from_email = $from_email; diff --git a/app/libraries/admin_form.php b/app/libraries/admin_form.php index 9f0c2d55..cd555f5f 100644 --- a/app/libraries/admin_form.php +++ b/app/libraries/admin_form.php @@ -414,7 +414,7 @@ function custom_fields ($custom_fields = array(), $values = array(), $no_default foreach ($custom_fields as $field) { $CI->load->library('custom_fields/fieldtype'); - $field_object =& $CI->fieldtype->load($field); + $field_object = $CI->fieldtype->load($field); // set value if (!empty($values) and isset($values[$field_object->name])) { diff --git a/app/libraries/auto_updater.php b/app/libraries/auto_updater.php index feeeed36..4b839ded 100644 --- a/app/libraries/auto_updater.php +++ b/app/libraries/auto_updater.php @@ -12,7 +12,8 @@ */ class Auto_updater { - function Auto_updater () { + + function __construct(){ $CI =& get_instance(); $software_version = $CI->config->item('app_version'); diff --git a/app/libraries/controllers/Admincp_Controller.php b/app/libraries/controllers/Admincp_Controller.php index eb42bb2f..c4f9de51 100644 --- a/app/libraries/controllers/Admincp_Controller.php +++ b/app/libraries/controllers/Admincp_Controller.php @@ -78,7 +78,8 @@ function __construct () { $this->module_definitions = new stdClass(); foreach ($modules as $module) { - MY_Loader::define_module($module . '/'); + $myloader = new MY_Loader(); + $myloader->define_module($module . '/'); } // define WYSIWYG session variables for file uploading diff --git a/app/libraries/controllers/Front_Controller.php b/app/libraries/controllers/Front_Controller.php index 29839376..b52fafa9 100644 --- a/app/libraries/controllers/Front_Controller.php +++ b/app/libraries/controllers/Front_Controller.php @@ -40,7 +40,8 @@ function __construct () { $this->module_definitions = new stdClass(); foreach ($modules as $module) { - MY_Loader::define_module($module . '/'); + $myloader = new MY_Loader(); + $myloader->define_module($module . '/'); } // load caching for the frontend diff --git a/app/libraries/dataset.php b/app/libraries/dataset.php index 59c5d9a6..97161a46 100644 --- a/app/libraries/dataset.php +++ b/app/libraries/dataset.php @@ -517,8 +517,8 @@ function table_head () { // build action buttons if (!empty($this->actions)) { - $actions .= 'With selected: '; - while (list(,$action) = each($this->actions)) { + $actions .= 'With selected: '; + foreach($this->actions as $action){ $actions .= ' '; $i++; } @@ -540,7 +540,7 @@ function table_head () { } // add column headers - while (list($key,$column) = each($this->columns)) { + foreach ($this->columns as $key => $column) { if (isset($column['sort_column']) and !empty($column['sort_column'])) { if ($this->sort_column == $column['sort_column'] and $this->sort_dir == 'asc') { $direction = 'desc'; @@ -578,7 +578,7 @@ function table_head () { $output .= ''; } - while (list(,$column) = each($this->columns)) { + foreach($this->columns as $idx => $column) { if ($column['filters'] == TRUE) { $output .= ''; diff --git a/app/libraries/smarty/Smarty.class.php b/app/libraries/smarty/Smarty.class.php index 75c90ffc..a2467f26 100644 --- a/app/libraries/smarty/Smarty.class.php +++ b/app/libraries/smarty/Smarty.class.php @@ -733,7 +733,9 @@ public function __call($name, $args) { static $camel_func; if (!isset($camel_func)) - $camel_func = create_function('$c', 'return "_" . strtolower($c[1]);'); + $camel_func = function($c) { + return "_" . strtolower( $c[1] ); + }; // see if this is a set/get for a property $first3 = strtolower(substr($name, 0, 3)); if (in_array($first3, array('set', 'get')) && substr($name, 3, 1) !== '_') { diff --git a/app/libraries/smarty/sysplugins/smarty_internal_compile_block.php b/app/libraries/smarty/sysplugins/smarty_internal_compile_block.php index b1b64374..6eb78c14 100644 --- a/app/libraries/smarty/sysplugins/smarty_internal_compile_block.php +++ b/app/libraries/smarty/sysplugins/smarty_internal_compile_block.php @@ -88,7 +88,7 @@ static function saveBlockData($block_content, $block_tag, $template, $filepath) } } - static function compileChildBlock ($compiler, $_name = null) + public function compileChildBlock ($compiler, $_name = null) { $_output = ''; // if called by {$smarty.block.child} we must search the name of enclosing {block} @@ -169,7 +169,8 @@ public function compile($args, $compiler) $saved_data = $this->_close_tag(array('block')); $_name = trim($saved_data[0]['name'], "\"'"); if (isset($compiler->template->block_data[$_name]) && !isset($compiler->template->block_data[$_name]['compiled'])) { - $_output = Smarty_Internal_Compile_Block::compileChildBlock($compiler, $_name); + $sicb = new Smarty_Internal_Compile_Block(); + $_output = $sicb->compileChildBlock($compiler, $_name); } else { $_output = $compiler->parser->current_buffer->to_smarty_php(); unset ($compiler->template->block_data[$_name]['compiled']); diff --git a/app/libraries/smarty/sysplugins/smarty_internal_compilebase.php b/app/libraries/smarty/sysplugins/smarty_internal_compilebase.php index 6418acce..0b639bee 100644 --- a/app/libraries/smarty/sysplugins/smarty_internal_compilebase.php +++ b/app/libraries/smarty/sysplugins/smarty_internal_compilebase.php @@ -49,31 +49,32 @@ function _get_attributes ($attributes) } // named attribute } else { - $kv = each($mixed); - // option flag? - if (in_array($kv['key'], $this->option_flags)) { - if (is_bool($kv['value'])) { - $_indexed_attr[$kv['key']] = $kv['value']; - } else if (is_string($kv['value']) && in_array(trim($kv['value'], '\'"'), array('true', 'false'))) { - if (trim($kv['value']) == 'true') { - $_indexed_attr[$kv['key']] = true; + foreach($mixed as $key => $value){ + // option flag? + if (in_array($key, $this->option_flags)) { + if (is_bool($value)) { + $_indexed_attr[$key] = $value; + } else if (is_string($value) && in_array(trim($value, '\'"'), array('true', 'false'))) { + if (trim($value) == 'true') { + $_indexed_attr[$key] = true; + } else { + $_indexed_attr[$key] = false; + } + } else if (is_numeric($value) && in_array($value, array(0, 1))) { + if ($value == 1) { + $_indexed_attr[$key] = true; + } else { + $_indexed_attr[$key] = false; + } } else { - $_indexed_attr[$kv['key']] = false; - } - } else if (is_numeric($kv['value']) && in_array($kv['value'], array(0, 1))) { - if ($kv['value'] == 1) { - $_indexed_attr[$kv['key']] = true; - } else { - $_indexed_attr[$kv['key']] = false; + $this->compiler->trigger_template_error("illegal value of option flag \"{$key}\"", $this->compiler->lex->taglineno); } + // must be named attribute } else { - $this->compiler->trigger_template_error("illegal value of option flag \"{$kv['key']}\"", $this->compiler->lex->taglineno); + reset($mixed); + $_indexed_attr[key($mixed)] = $mixed[key($mixed)]; } - // must be named attribute - } else { - reset($mixed); - $_indexed_attr[key($mixed)] = $mixed[key($mixed)]; - } + } } } // check if all required attributes present diff --git a/app/models/admincp/notices.php b/app/models/admincp/notices.php index b2d93f4b..c5745204 100644 --- a/app/models/admincp/notices.php +++ b/app/models/admincp/notices.php @@ -11,7 +11,7 @@ */ class Notices extends CI_Model { - function Notices() { + function __construct() { parent::__construct(); } diff --git a/app/models/install_model.php b/app/models/install_model.php new file mode 100644 index 00000000..b0e40dff --- /dev/null +++ b/app/models/install_model.php @@ -0,0 +1,88 @@ +config = array( + 'hostname' => $this->input->post('db_host'), + 'username' => $this->input->post('db_user'), + 'password' => $this->input->post('db_pass'), + 'database' => $this->input->post('db_name'), + 'dbdriver' => "mysqli", + 'dbprefix' => "", + 'pconnect' => FALSE, + 'db_debug' => TRUE, + 'cache_on' => FALSE, + 'cachedir' => "", + 'char_set' => "utf8", + 'dbcollat' => "utf8_general_ci" + ); + $this->installdb = $this->load->database($this->config); + if ($this->installdb) { + $valid_mysql = TRUE; + } + return $valid_mysql; + } + + function run_setup_queries() + { + $structure = read_file(APPPATH . 'updates/install.php'); + $structure = str_replace('','',$structure); + + // break into newlines + $structure = explode("\n",$structure); + + // run mysql queries + $query = ""; + $querycount = 0; + + foreach ($structure as $sql_line) + { + if (trim($sql_line) != "" and substr($sql_line,0,2) != "--") + { + $query .= $sql_line; + if (substr(trim($query), -1, 1) == ";") + { + // this query is finished, execute it + if ($this->installdb->query($query)) { + $query = ""; + $querycount++; + } else { + show_error('There was a critical error importing the initial database structure. Please contact support.

Query:

' . $query); + die(); + } + } + } + } + // update settings + $this->installdb->query( + 'UPDATE `settings` SET `setting_value`="' + . $this->input->post('site_name') + . '" WHERE `setting_name`="site_name" or `setting_name`="email_name"' + ); + $this->installdb->query( + 'UPDATE `settings` SET `setting_value`="' + . $this->input->post('site_email') + . '" WHERE `setting_name`="site_email"' + ); + } +} \ No newline at end of file diff --git a/app/modules/blogs/blogs.php b/app/modules/blogs/blogs.php index 1c50d193..b11a3b47 100644 --- a/app/modules/blogs/blogs.php +++ b/app/modules/blogs/blogs.php @@ -56,7 +56,7 @@ function update ($db_version) { `blog_template` varchar(255) NOT NULL, `blog_per_page` int(11) NOT NULL, PRIMARY KEY (`blog_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); } return $this->version; diff --git a/app/modules/emails/emails.php b/app/modules/emails/emails.php index a4ef348b..5543ff30 100644 --- a/app/modules/emails/emails.php +++ b/app/modules/emails/emails.php @@ -54,7 +54,7 @@ function update ($db_version) { `email_is_html` tinyint(1) NOT NULL, `email_deleted` tinyint(0) NOT NULL, PRIMARY KEY (`email_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); } if ($db_version < 1.04) { @@ -95,7 +95,7 @@ function update ($db_version) { `wordwrap` TINYINT(1) NOT NULL, `is_html` TINYINT(1) NOT NULL, PRIMARY KEY (`mail_queue_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); $this->CI->load->library('app_hooks'); @@ -119,7 +119,7 @@ function update ($db_version) { `email_template_body` text NOT NULL, `email_template_is_html` tinyint(1) NOT NULL, PRIMARY KEY (`email_template_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); } if ($db_version < 1.09) { @@ -139,12 +139,11 @@ function update ($db_version) { */ function _email_import($import) { $this->CI->load->helper('file'); - + //var_dump($import); foreach ($import as $hook => $details) { $subject = $details['subject']; $to = $details['to']; $bcc = isset($details['bcc']) ? $details['bcc'] : array(); - if (file_exists(APPPATH . 'modules/emails/template_import/' . $hook . '.thtml')) { $insert_fields = array( 'hook_name' => $hook, @@ -152,7 +151,9 @@ function _email_import($import) { 'email_subject' => $subject, 'email_recipients' => serialize($to), 'email_bccs' => serialize($bcc), - 'email_is_html' => '1' + 'email_is_html' => '1', + 'email_body_template' => APPPATH . 'modules/emails/template_import/' . $hook . '.thtml', + 'email_deleted' => 0 ); $this->CI->db->insert('emails', $insert_fields); diff --git a/app/modules/forms/forms.php b/app/modules/forms/forms.php index b1d4f314..fec7edfc 100644 --- a/app/modules/forms/forms.php +++ b/app/modules/forms/forms.php @@ -64,7 +64,7 @@ function update ($db_version) { `form_privileges` varchar(250) NOT NULL, `form_template` varchar(100) NOT NULL, PRIMARY KEY (`form_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); } // return current version diff --git a/app/modules/menu_manager/menu_manager.php b/app/modules/menu_manager/menu_manager.php index 37f27335..d17b9f4f 100644 --- a/app/modules/menu_manager/menu_manager.php +++ b/app/modules/menu_manager/menu_manager.php @@ -56,13 +56,13 @@ function update ($db_version) { `menu_link_privileges` varchar(255), `menu_link_order` int(5), PRIMARY KEY (`menu_link_id`) - ) ENGINE=MyISAM AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); $this->CI->db->query('CREATE TABLE `menus` ( `menu_id` int(11) NOT NULL auto_increment, `menu_name` varchar(200) NOT NULL, PRIMARY KEY (`menu_id`) - ) ENGINE=MyISAM AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb AUTO_INCREMENT=1000 DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); } if ($db_version < 1.02) { diff --git a/app/modules/modules/models/module_model.php b/app/modules/modules/models/module_model.php index c4a63082..2418594d 100644 --- a/app/modules/modules/models/module_model.php +++ b/app/modules/modules/models/module_model.php @@ -21,6 +21,8 @@ function __construct() { // pre-cache modules table $result = $this->db->get('modules'); + + //var_dump($result); $this->modules_cache = array(); diff --git a/app/modules/publish/controllers/admincp.php b/app/modules/publish/controllers/admincp.php index 292944f9..51ac6f20 100644 --- a/app/modules/publish/controllers/admincp.php +++ b/app/modules/publish/controllers/admincp.php @@ -480,6 +480,7 @@ function edit ($id) { $this->load->library('admin_form'); + if ($type['is_standard'] == TRUE) { // we require Title, URL Path, and Topic fields diff --git a/app/modules/publish/models/content_type_model.php b/app/modules/publish/models/content_type_model.php index 1572c3f1..6af02d4a 100644 --- a/app/modules/publish/models/content_type_model.php +++ b/app/modules/publish/models/content_type_model.php @@ -101,7 +101,7 @@ function new_content_type ($name, $is_standard = TRUE, $is_privileged = FALSE, $ `{$system_name}_id` INT(11) AUTO_INCREMENT PRIMARY KEY, `content_id` INT(11) NOT NULL, INDEX ( `content_id` ) - ) ENGINE = MYISAM"; + ) ENGINE = Innodb"; $this->db->query($sql); } diff --git a/app/modules/publish/models/topic_model.php b/app/modules/publish/models/topic_model.php index 3a4fc96b..099b1e3a 100644 --- a/app/modules/publish/models/topic_model.php +++ b/app/modules/publish/models/topic_model.php @@ -203,7 +203,7 @@ function make_tiers($terms, &$tiers, $index=0, $names='') { if (is_array($terms[$index])) { - while(list($id, $name) = each($terms[$index])) + foreach($terms[$index] as $id => $name) { if ($index == 0) { diff --git a/app/modules/publish/publish.php b/app/modules/publish/publish.php index 5d5f90ce..9a15dc37 100644 --- a/app/modules/publish/publish.php +++ b/app/modules/publish/publish.php @@ -80,7 +80,7 @@ function update ($db_version) { `content_type_system_name` varchar(50) NOT NULL, `content_type_template` varchar(255) NOT NULL, PRIMARY KEY (`content_type_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); } if ($db_version < 1.03) { @@ -89,7 +89,7 @@ function update ($db_version) { `topic_id` int(11) NOT NULL, `content_id` int(11) NOT NULL, PRIMARY KEY (`topic_map_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); $this->CI->db->query('CREATE TABLE IF NOT EXISTS `topics` ( `topic_id` int(11) NOT NULL auto_increment, @@ -98,7 +98,7 @@ function update ($db_version) { `topic_description` text NOT NULL, `topic_deleted` tinyint(1) NOT NULL, PRIMARY KEY (`topic_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1000 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1000 ;'); } if ($db_version < 1.09) { @@ -117,7 +117,7 @@ function update ($db_version) { `content_privileges` varchar(255), `content_hits` int(11), PRIMARY KEY (`content_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); } if ($db_version < 1.10) { diff --git a/app/modules/rss/rss.php b/app/modules/rss/rss.php index 24e9bb07..6ff46b94 100644 --- a/app/modules/rss/rss.php +++ b/app/modules/rss/rss.php @@ -51,7 +51,7 @@ function update ($db_version) { `rss_sort_dir` varchar(5) NOT NULL, `rss_template` varchar(150) NOT NULL, PRIMARY KEY (`rss_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); } return $this->version; diff --git a/app/modules/theme/controllers/admincp.php b/app/modules/theme/controllers/admincp.php index e6f2bbb6..4f3b319d 100644 --- a/app/modules/theme/controllers/admincp.php +++ b/app/modules/theme/controllers/admincp.php @@ -255,12 +255,13 @@ function save_file () { } // you can only write certain filetypes - $extension = end(explode('.',$path)); + $exPath = explode('.', $path); + $extension = end($exPath); if (!in_array($extension, array('html','thtml','txml','trss','xml','rss','js','css'))) { return FALSE; } - - if (file_exists($path) and !is_really_writable($path)) { + + if (file_exists($path) and !is_writable($path)) { return FALSE; } diff --git a/app/modules/users/models/user_model.php b/app/modules/users/models/user_model.php index ed1c406c..19e78d46 100644 --- a/app/modules/users/models/user_model.php +++ b/app/modules/users/models/user_model.php @@ -153,9 +153,9 @@ public function login ($username, $password, $remember = FALSE) { $user_db = $query->row_array(); $user = $this->get_user($user_db['user_id']); - $hashed_password = ($user['salt'] == '') ? md5($password) : md5($password . ':' . $user['salt']); + $hashPassSalt = (($user['salt'] == '') ? $this->generatePassSalt($password,'') : $this->generatePassSalt($password,$user['salt'])); - if ($hashed_password == $user_db['user_password']) { + if ($hashPassSalt->pass == $user_db['user_password']) { $authenticated = TRUE; } } @@ -923,11 +923,7 @@ function new_user($email, $password, $username, $first_name, $last_name, $groups $validate_key = ''; } - // generate hashed password - $CI =& get_instance(); - $CI->load->helper('string'); - $salt = random_string('unique'); - $hashed_password = md5($password . ':' . $salt); + $hashPassSalt = $this->generatePassSalt($password); $insert_fields = array( 'user_is_admin' => ($is_admin == TRUE) ? '1' : '0', @@ -936,11 +932,11 @@ function new_user($email, $password, $username, $first_name, $last_name, $groups 'user_last_name' => $last_name, 'user_username' => $username, 'user_email' => $email, - 'user_password' => $hashed_password, - 'user_salt' => $salt, + 'user_password' => $hashPassSalt->pass, + 'user_salt' => $hashPassSalt->salt, 'user_referrer' => ($affiliate != FALSE) ? $affiliate : '0', 'user_signup_date' => date('Y-m-d H:i:s'), - 'user_last_login' => '0000-00-00 00:00:00', + 'user_last_login' => date('Y-m-d H:i:s'), 'user_suspended' => '0', 'user_deleted' => '0', 'user_remember_key' => '', @@ -958,6 +954,7 @@ function new_user($email, $password, $username, $first_name, $last_name, $groups // create customer record if (module_installed('billing')) { + $CI =& get_instance(); $CI->load->model('billing/customer_model'); $customer = array(); @@ -1013,6 +1010,28 @@ function new_user($email, $password, $username, $first_name, $last_name, $groups return $user_id; } + /** + * Generate a hashed password and unique salt + * + * @param string $password the password enetered by the user + * @return array an array containing the password and salt for a user + */ + function generatePassSalt($password,$salt=null){ + // generate hashed password + if($salt == '' ) { + $hashed_password = md5($password); + } else { + if($salt == null){ + $salt = uniqid(); + } + $hashed_password = md5($password . ':' . $salt); + } + $hashed_obj = new STDClass; + $hashed_obj->pass = $hashed_password; + $hashed_obj->salt = $salt; + return $hashed_obj; + } + /** * Update User * @@ -1180,12 +1199,9 @@ function delete_user ($user_id) { * @return boolean */ function update_password ($user_id, $new_password) { - $CI =& get_instance(); - $CI->load->helper('string'); - $salt = random_string('unique'); - $hashed_password = md5($new_password . ':' . $salt); + $hashPassSalt = $this->generatePassSalt($new_password); - $this->db->update('users',array('user_password' => $hashed_password, 'user_salt' => $salt),array('user_id' => $user_id)); + $this->db->update('users',array('user_password' => $hashPassSalt->pass, 'user_salt' => $hashPassSalt->salt),array('user_id' => $user_id)); // prep hook $CI =& get_instance(); @@ -1215,7 +1231,8 @@ function reset_password ($user_id) { $this->load->helper('string'); $password = random_string('alnum',9); - $this->db->update('users',array('user_password' => md5($password), 'user_salt' => ''),array('user_id' => $user['id'])); + $hashPass = $this->generatePassSalt($password,''); + $this->db->update('users',array('user_password' => $hashPass->pass, 'user_salt' => ''),array('user_id' => $user['id'])); // hook call $CI =& get_instance(); diff --git a/app/modules/users/users.php b/app/modules/users/users.php index 551d9a98..f726a5d6 100644 --- a/app/modules/users/users.php +++ b/app/modules/users/users.php @@ -65,7 +65,7 @@ function update ($db_version) { `usergroup_name` varchar(150) NOT NULL, `usergroup_default` tinyint(4) NULL, PRIMARY KEY (`usergroup_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); $insert_fields = array( 'usergroup_name' => 'Default', @@ -94,7 +94,7 @@ function update ($db_version) { `user_cart` text, `user_pending_charge_id` int(11), PRIMARY KEY (`user_id`) - ) ENGINE=MyISAM AUTO_INCREMENT=1001 DEFAULT CHARSET=utf8 AUTO_INCREMENT=1001 ;'); + ) ENGINE=Innodb AUTO_INCREMENT=1001 DEFAULT CHARSET=utf8 AUTO_INCREMENT=1001 ;'); } if ($db_version < 1.01) { @@ -107,7 +107,7 @@ function update ($db_version) { `user_field_admin_only` tinyint(1) NOT NULL, `user_field_registration_form` tinyint(1) NOT NULL, PRIMARY KEY (`user_field_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;'); } if ($db_version < 1.02) { @@ -127,7 +127,7 @@ function update ($db_version) { `user_login_ip` varchar(50) NOT NULL, `user_login_browser` varchar(255) NOT NULL, PRIMARY KEY (`user_login_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1000 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1000 ;'); } if ($db_version < 1.05) { @@ -175,7 +175,7 @@ function update ($db_version) { `user_id` int(11) NOT NULL, `user_activity_date` DATETIME NOT NULL, PRIMARY KEY (`user_activity_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1000 ;'); + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1000 ;'); } if ($db_version < 1.13) { diff --git a/app/third_party/MX/Lang.php b/app/third_party/MX/Lang.php index 2322fa78..0dce8c16 100644 --- a/app/third_party/MX/Lang.php +++ b/app/third_party/MX/Lang.php @@ -35,7 +35,7 @@ **/ class MX_Lang extends CI_Lang { - public function load($langfile, $lang = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '') { + public function load($langfile='', $lang = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '') { if (is_array($langfile)) { foreach($langfile as $_lang) $this->load($_lang); @@ -64,4 +64,4 @@ public function load($langfile, $lang = '', $return = FALSE, $add_suffix = TRUE, return $this->language; } -} \ No newline at end of file +} diff --git a/app/third_party/MX/Loader.php b/app/third_party/MX/Loader.php index 2397397c..9c173c83 100644 --- a/app/third_party/MX/Loader.php +++ b/app/third_party/MX/Loader.php @@ -83,7 +83,8 @@ public function config($file = 'config', $use_sections = FALSE, $fail_gracefully } /** Load the database drivers **/ - public function database($params = '', $return = FALSE, $active_record = NULL) { + public function database($params = '', $return = FALSE, $active_record = NULL) + { if (class_exists('CI_DB', FALSE) AND $return == FALSE AND $active_record == NULL AND isset(CI::$APP->db) AND is_object(CI::$APP->db)) return; @@ -98,7 +99,7 @@ public function database($params = '', $return = FALSE, $active_record = NULL) { } /** Load a module helper **/ - public function helper($helper) { + public function helper($helper = array()) { if (is_array($helper)) return $this->helpers($helper); @@ -113,24 +114,29 @@ public function helper($helper) { } /** Load an array of helpers **/ - public function helpers($helpers) { + public function helpers($helpers = array()) { foreach ($helpers as $_helper) $this->helper($_helper); } /** Load a module language file **/ - public function language($langfile, $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '') { + /*public function language($langfile, $idiom = '', $return = FALSE, $add_suffix = TRUE, $alt_path = '') { return CI::$APP->lang->load($langfile, $idiom, $return, $add_suffix, $alt_path, $this->_module); + }*/ + + public function language($file = array(), $lang = '') + { + return CI::$APP->lang->load($langfile, $lang); } - + public function languages($languages) { foreach($languages as $_language) $this->language($language); } /** Load a module library **/ - public function library($library, $params = NULL, $object_name = NULL) { + public function library($library='', $params = NULL, $object_name = NULL) { if (is_array($library)) return $this->libraries($library); - - $class = strtolower(end(explode('/', $library))); + $endLibrary = explode('/', $library); + $class = strtolower(end($endLibrary)); if (isset($this->_ci_classes[$class]) AND $_alias = $this->_ci_classes[$class]) return CI::$APP->$_alias; @@ -172,8 +178,8 @@ public function libraries($libraries) { public function model($model, $object_name = NULL, $connect = FALSE) { if (is_array($model)) return $this->models($model); - - ($_alias = $object_name) OR $_alias = end(explode('/', $model)); + $modelEnd = explode('/', $model); + ($_alias = $object_name) OR $_alias = end($modelEnd); if (in_array($_alias, $this->_ci_models, TRUE)) return CI::$APP->$_alias; @@ -215,8 +221,8 @@ function models($models) { public function module($module, $params = NULL) { if (is_array($module)) return $this->modules($module); - - $_alias = strtolower(end(explode('/', $module))); + $moduleEnd = explode('/', $module); + $_alias = strtolower(end($moduleEnd)); CI::$APP->$_alias = Modules::load(array($module => $params)); return CI::$APP->$_alias; } @@ -256,7 +262,7 @@ public function view($view, $vars = array(), $return = FALSE) { public function _ci_is_instance() {} - public function _ci_get_component($component) { + public function & _ci_get_component($component) { return CI::$APP->$component; } @@ -274,7 +280,8 @@ function _ci_load($_ci_data) { $_ci_file = strpos($_ci_view, '.') ? $_ci_view : $_ci_view.EXT; $_ci_path = $this->_ci_view_path.$_ci_file; } else { - $_ci_file = end(explode('/', $_ci_path)); + $pathEnd = explode('/', $_ci_path); + $_ci_file = end($pathEnd); } if ( ! file_exists($_ci_path)) @@ -288,7 +295,23 @@ function _ci_load($_ci_data) { ob_start(); if ((bool) @ini_get('short_open_tag') === FALSE AND CI::$APP->config->item('rewrite_short_tags') == TRUE) { - echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace(''; + $preg_replace = '; ?>'; + $pattern = array('' . + preg_replace( + '/' . $preg_pattern . '/', + $preg_replace, + str_replace( + $pattern, + $replace, + file_get_contents($_ci_path) + ) + ) + ); } else { include($_ci_path); } @@ -377,4 +400,4 @@ public function _autoloader($autoload) { } /** load the CI class for Modular Separation **/ -(class_exists('CI', FALSE)) OR require dirname(__FILE__).'/Ci.php'; \ No newline at end of file +(class_exists('CI', FALSE)) OR require dirname(__FILE__).'/Ci.php'; diff --git a/app/third_party/MX/Modules.php b/app/third_party/MX/Modules.php index 8abeb3e4..8557a03d 100644 --- a/app/third_party/MX/Modules.php +++ b/app/third_party/MX/Modules.php @@ -77,7 +77,13 @@ public static function run($module) { /** Load a module controller **/ public static function load($module) { - (is_array($module)) ? list($module, $params) = each($module) : $params = NULL; + if(is_array($module)){ + $modules = $module; + $module = array_keys($module); + $params = array_values($params); + } else { + $params = NULL; + } /* get the requested controller class name */ $alias = strtolower(end(explode('/', $module))); diff --git a/app/updates/3.01.php b/app/updates/3.01.php index 1998cca2..a1def465 100644 --- a/app/updates/3.01.php +++ b/app/updates/3.01.php @@ -13,7 +13,7 @@ `hook_created` DATETIME NOT NULL, PRIMARY KEY (`hook_id`), INDEX (`hook_name`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8;'; + ) ENGINE=Innodb DEFAULT CHARSET=utf8;'; foreach ($sql as $query) { $CI->db->query($query); diff --git a/app/updates/3.02.php b/app/updates/3.02.php index bda77fb2..c3706731 100644 --- a/app/updates/3.02.php +++ b/app/updates/3.02.php @@ -13,7 +13,7 @@ `bind_created` DATETIME NOT NULL, PRIMARY KEY (`bind_id`), INDEX (`hook_name`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8;'; + ) ENGINE=Innodb DEFAULT CHARSET=utf8;'; foreach ($sql as $query) { $CI->db->query($query); diff --git a/app/updates/install.php b/app/updates/install.php index 6827612c..df901bc7 100644 --- a/app/updates/install.php +++ b/app/updates/install.php @@ -10,7 +10,7 @@ `iso3` varchar(3) NOT NULL, `name` varchar(255) NOT NULL, PRIMARY KEY (`country_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=Innodb DEFAULT CHARSET=utf8; -- -- Dumping data for table `countries` @@ -195,11 +195,11 @@ (620, 'PT', 'PRT', 'Portugal'), (630, 'PR', 'PRI', 'Puerto Rico'), (634, 'QA', 'QAT', 'Qatar'), -(638, 'RE', 'REU', 'RŽunion'), +(638, 'RE', 'REU', 'R�union'), (642, 'RO', 'ROU', 'Romania'), (643, 'RU', 'RUS', 'Russian Federation'), (646, 'RW', 'RWA', 'Rwanda'), -(652, 'BL', 'BLM', 'Saint BarthŽlemy'), +(652, 'BL', 'BLM', 'Saint Barth�lemy'), (654, 'SH', 'SHN', 'Saint Helena'), (659, 'KN', 'KNA', 'Saint Kitts and Nevis'), (662, 'LC', 'LCA', 'Saint Lucia'), @@ -283,7 +283,7 @@ `custom_field_validators` text, `custom_field_help_text` text, PRIMARY KEY (`custom_field_id`) -) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ; +) ENGINE=Innodb AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ; -- -------------------------------------------------------- @@ -295,7 +295,7 @@ `custom_field_group_id` int(11) NOT NULL auto_increment, `custom_field_group_name` varchar(150) NOT NULL, PRIMARY KEY (`custom_field_group_id`) -) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ; +) ENGINE=Innodb AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ; INSERT INTO `custom_field_groups` (`custom_field_group_id`, `custom_field_group_name`) VALUES ('1', 'Members'); @@ -311,7 +311,7 @@ `link_controller` varchar(250), `link_method` varchar(250), PRIMARY KEY (`link_id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; + ) ENGINE=Innodb DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; -- -- Table structure for table `modules` @@ -322,7 +322,7 @@ `module_name` varchar(50) NOT NULL , `module_version` varchar(25) NOT NULL , PRIMARY KEY (`module_id`) -) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; +) ENGINE=Innodb AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ; CREATE TABLE IF NOT EXISTS `ci_sessions` ( session_id varchar(40) DEFAULT '0' NOT NULL, @@ -351,7 +351,7 @@ `setting_options` text, `setting_hidden` tinyint(1), PRIMARY KEY (`setting_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 ; +) ENGINE=Innodb DEFAULT CHARSET=utf8 ; -- -- Dumping data for table `settings` @@ -380,7 +380,7 @@ `setting_group_name` varchar(250) default NULL, `setting_group_help` varchar(250) default NULL, PRIMARY KEY (`setting_group_id`) -) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ; +) ENGINE=Innodb AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ; -- -- Dumping data for table `settings_groups` @@ -405,7 +405,7 @@ `name_short` char(2) NOT NULL default '' COMMENT 'USPS Abbreviation', PRIMARY KEY (`state_id`), UNIQUE KEY `name_long` (`name_long`) -) ENGINE=MyISAM AUTO_INCREMENT=64 DEFAULT CHARSET=utf8 COMMENT='US States' AUTO_INCREMENT=64 ; +) ENGINE=Innodb AUTO_INCREMENT=64 DEFAULT CHARSET=utf8 COMMENT='US States' AUTO_INCREMENT=64 ; -- -- Dumping data for table `states` @@ -484,7 +484,7 @@ CREATE TABLE `system` ( `db_version` varchar(15) NOT NULL, PRIMARY KEY (`db_version`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=Innodb DEFAULT CHARSET=utf8; -- -- Dumping data for table `system` diff --git a/app/views/cp/dashboard.php b/app/views/cp/dashboard.php old mode 100644 new mode 100755 diff --git a/app/views/cp/error.php b/app/views/cp/error.php old mode 100644 new mode 100755 diff --git a/app/views/cp/footer.php b/app/views/cp/footer.php old mode 100644 new mode 100755 diff --git a/app/views/cp/header.php b/app/views/cp/header.php old mode 100644 new mode 100755 diff --git a/app/views/cp/html_footer.php b/app/views/cp/html_footer.php old mode 100644 new mode 100755 diff --git a/app/views/cp/html_header.php b/app/views/cp/html_header.php old mode 100644 new mode 100755 diff --git a/app/views/cp/login.php b/app/views/cp/login.php old mode 100644 new mode 100755 diff --git a/app/views/index.html b/app/views/index.html old mode 100644 new mode 100755 diff --git a/app/views/install/admin.php b/app/views/install/admin.php old mode 100644 new mode 100755 diff --git a/app/views/install/complete.php b/app/views/install/complete.php old mode 100644 new mode 100755 diff --git a/app/views/install/configuration.php b/app/views/install/configuration.php old mode 100644 new mode 100755 index a255cdf3..e8badd7d --- a/app/views/install/configuration.php +++ b/app/views/install/configuration.php @@ -4,7 +4,7 @@

Installation takes just a few moments.

-

must be writable by the web server - You must set the +

must be writable by the web server - You must set the folderfile permissions with CHMOD (0666, 0755, or 0777) and, possibly, file ownership with a CHOWN command.

@@ -57,7 +57,7 @@
  • - +
  • diff --git a/app/views/install/footer.php b/app/views/install/footer.php old mode 100644 new mode 100755 diff --git a/app/views/install/header.php b/app/views/install/header.php old mode 100644 new mode 100755 index 0d30a15c..32137899 --- a/app/views/install/header.php +++ b/app/views/install/header.php @@ -19,9 +19,9 @@ diff --git a/branding/default/css/dashboard.css b/branding/default/css/dashboard.css old mode 100644 new mode 100755 diff --git a/branding/default/css/dataset.css b/branding/default/css/dataset.css old mode 100644 new mode 100755 diff --git a/branding/default/css/datepicker.css b/branding/default/css/datepicker.css old mode 100644 new mode 100755 diff --git a/branding/default/css/installer.css b/branding/default/css/installer.css old mode 100644 new mode 100755 diff --git a/branding/default/css/login.css b/branding/default/css/login.css old mode 100644 new mode 100755 diff --git a/branding/default/css/menu_manager.css b/branding/default/css/menu_manager.css old mode 100644 new mode 100755 diff --git a/branding/default/css/settings.css b/branding/default/css/settings.css old mode 100644 new mode 100755 diff --git a/branding/default/css/theme_editor.css b/branding/default/css/theme_editor.css old mode 100644 new mode 100755 diff --git a/branding/default/css/universal.css b/branding/default/css/universal.css old mode 100644 new mode 100755 diff --git a/branding/default/images/arrow.png b/branding/default/images/arrow.png old mode 100644 new mode 100755 diff --git a/branding/default/images/box-bottom-left.gif b/branding/default/images/box-bottom-left.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/box-bottom-right.gif b/branding/default/images/box-bottom-right.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/box-bottom.gif b/branding/default/images/box-bottom.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/box-right.gif b/branding/default/images/box-right.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/box-top-right.gif b/branding/default/images/box-top-right.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/button.gif b/branding/default/images/button.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/creditcard.png b/branding/default/images/creditcard.png old mode 100644 new mode 100755 diff --git a/branding/default/images/customer.png b/branding/default/images/customer.png old mode 100644 new mode 100755 diff --git a/branding/default/images/dashbox_top.gif b/branding/default/images/dashbox_top.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/gateway.png b/branding/default/images/gateway.png old mode 100644 new mode 100755 diff --git a/branding/default/images/grey_arrow.gif b/branding/default/images/grey_arrow.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/large_button.gif b/branding/default/images/large_button.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/loading.gif b/branding/default/images/loading.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/login.gif b/branding/default/images/login.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/money.png b/branding/default/images/money.png old mode 100644 new mode 100755 diff --git a/branding/default/images/nav_dashboard.png b/branding/default/images/nav_dashboard.png old mode 100644 new mode 100755 diff --git a/branding/default/images/recurring.png b/branding/default/images/recurring.png old mode 100644 new mode 100755 diff --git a/branding/default/images/refreshing.gif b/branding/default/images/refreshing.gif old mode 100644 new mode 100755 diff --git a/branding/default/images/refunded.png b/branding/default/images/refunded.png old mode 100644 new mode 100755 diff --git a/branding/default/images/secure64.png b/branding/default/images/secure64.png old mode 100644 new mode 100755 diff --git a/branding/default/images/support.png b/branding/default/images/support.png old mode 100644 new mode 100755 diff --git a/branding/default/images/warning64.png b/branding/default/images/warning64.png old mode 100644 new mode 100755 diff --git a/branding/default/images/x.png b/branding/default/images/x.png old mode 100644 new mode 100755 diff --git a/branding/default/js/arrange_fields.js b/branding/default/js/arrange_fields.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/.htaccess b/branding/default/js/ckeditor.old/.htaccess old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/CHANGES.md b/branding/default/js/ckeditor.old/CHANGES.md old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/LICENSE.html b/branding/default/js/ckeditor.old/LICENSE.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/LICENSE.md b/branding/default/js/ckeditor.old/LICENSE.md old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/README.md b/branding/default/js/ckeditor.old/README.md old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/adapters/jquery.js b/branding/default/js/ckeditor.old/adapters/jquery.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/build-config.js b/branding/default/js/ckeditor.old/build-config.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/ckeditor.asp b/branding/default/js/ckeditor.old/ckeditor.asp old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/ckeditor.js b/branding/default/js/ckeditor.old/ckeditor.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/ckeditor.pack b/branding/default/js/ckeditor.old/ckeditor.pack old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/ckeditor.php b/branding/default/js/ckeditor.old/ckeditor.php old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/ckeditor_basic.js b/branding/default/js/ckeditor.old/ckeditor_basic.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/ckeditor_basic_source.js b/branding/default/js/ckeditor.old/ckeditor_basic_source.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/ckeditor_php4.php b/branding/default/js/ckeditor.old/ckeditor_php4.php old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/ckeditor_php5.php b/branding/default/js/ckeditor.old/ckeditor_php5.php old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/ckeditor_source.js b/branding/default/js/ckeditor.old/ckeditor_source.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/config.js b/branding/default/js/ckeditor.old/config.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/contents.css b/branding/default/js/ckeditor.old/contents.css old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/images/spacer.gif b/branding/default/js/ckeditor.old/images/spacer.gif old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/kcfinder/browse.php b/branding/default/js/ckeditor.old/kcfinder/browse.php old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/kcfinder/config.php b/branding/default/js/ckeditor.old/kcfinder/config.php old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/kcfinder/js_localize.php b/branding/default/js/ckeditor.old/kcfinder/js_localize.php old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/kcfinder/lib/class_gd.php b/branding/default/js/ckeditor.old/kcfinder/lib/class_gd.php index ad35edcf..38dce4f6 100644 --- a/branding/default/js/ckeditor.old/kcfinder/lib/class_gd.php +++ b/branding/default/js/ckeditor.old/kcfinder/lib/class_gd.php @@ -52,8 +52,8 @@ protected function build_image($image) { $height = @imagesy($image); } elseif (is_array($image)) { - list($key, $width) = each($image); - list($key, $height) = each($image); + $width = $image[0]; + $height = $image[1]; $image = imagecreatetruecolor($width, $height); } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) { diff --git a/branding/default/js/ckeditor.old/kcfinder/upload.php b/branding/default/js/ckeditor.old/kcfinder/upload.php old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/_languages.js b/branding/default/js/ckeditor.old/lang/_languages.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/_translationstatus.txt b/branding/default/js/ckeditor.old/lang/_translationstatus.txt old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/af.js b/branding/default/js/ckeditor.old/lang/af.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/ar.js b/branding/default/js/ckeditor.old/lang/ar.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/bg.js b/branding/default/js/ckeditor.old/lang/bg.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/bn.js b/branding/default/js/ckeditor.old/lang/bn.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/bs.js b/branding/default/js/ckeditor.old/lang/bs.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/ca.js b/branding/default/js/ckeditor.old/lang/ca.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/cs.js b/branding/default/js/ckeditor.old/lang/cs.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/cy.js b/branding/default/js/ckeditor.old/lang/cy.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/da.js b/branding/default/js/ckeditor.old/lang/da.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/de.js b/branding/default/js/ckeditor.old/lang/de.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/el.js b/branding/default/js/ckeditor.old/lang/el.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/en-au.js b/branding/default/js/ckeditor.old/lang/en-au.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/en-ca.js b/branding/default/js/ckeditor.old/lang/en-ca.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/en-gb.js b/branding/default/js/ckeditor.old/lang/en-gb.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/en.js b/branding/default/js/ckeditor.old/lang/en.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/eo.js b/branding/default/js/ckeditor.old/lang/eo.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/es.js b/branding/default/js/ckeditor.old/lang/es.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/et.js b/branding/default/js/ckeditor.old/lang/et.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/eu.js b/branding/default/js/ckeditor.old/lang/eu.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/fa.js b/branding/default/js/ckeditor.old/lang/fa.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/fi.js b/branding/default/js/ckeditor.old/lang/fi.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/fo.js b/branding/default/js/ckeditor.old/lang/fo.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/fr-ca.js b/branding/default/js/ckeditor.old/lang/fr-ca.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/fr.js b/branding/default/js/ckeditor.old/lang/fr.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/gl.js b/branding/default/js/ckeditor.old/lang/gl.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/gu.js b/branding/default/js/ckeditor.old/lang/gu.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/he.js b/branding/default/js/ckeditor.old/lang/he.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/hi.js b/branding/default/js/ckeditor.old/lang/hi.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/hr.js b/branding/default/js/ckeditor.old/lang/hr.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/hu.js b/branding/default/js/ckeditor.old/lang/hu.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/is.js b/branding/default/js/ckeditor.old/lang/is.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/it.js b/branding/default/js/ckeditor.old/lang/it.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/ja.js b/branding/default/js/ckeditor.old/lang/ja.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/ka.js b/branding/default/js/ckeditor.old/lang/ka.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/km.js b/branding/default/js/ckeditor.old/lang/km.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/ko.js b/branding/default/js/ckeditor.old/lang/ko.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/ku.js b/branding/default/js/ckeditor.old/lang/ku.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/lt.js b/branding/default/js/ckeditor.old/lang/lt.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/lv.js b/branding/default/js/ckeditor.old/lang/lv.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/mk.js b/branding/default/js/ckeditor.old/lang/mk.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/mn.js b/branding/default/js/ckeditor.old/lang/mn.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/ms.js b/branding/default/js/ckeditor.old/lang/ms.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/nb.js b/branding/default/js/ckeditor.old/lang/nb.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/nl.js b/branding/default/js/ckeditor.old/lang/nl.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/no.js b/branding/default/js/ckeditor.old/lang/no.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/pl.js b/branding/default/js/ckeditor.old/lang/pl.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/pt-br.js b/branding/default/js/ckeditor.old/lang/pt-br.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/pt.js b/branding/default/js/ckeditor.old/lang/pt.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/ro.js b/branding/default/js/ckeditor.old/lang/ro.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/ru.js b/branding/default/js/ckeditor.old/lang/ru.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/sk.js b/branding/default/js/ckeditor.old/lang/sk.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/sl.js b/branding/default/js/ckeditor.old/lang/sl.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/sr-latn.js b/branding/default/js/ckeditor.old/lang/sr-latn.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/sr.js b/branding/default/js/ckeditor.old/lang/sr.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/sv.js b/branding/default/js/ckeditor.old/lang/sv.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/th.js b/branding/default/js/ckeditor.old/lang/th.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/tr.js b/branding/default/js/ckeditor.old/lang/tr.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/ug.js b/branding/default/js/ckeditor.old/lang/ug.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/uk.js b/branding/default/js/ckeditor.old/lang/uk.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/vi.js b/branding/default/js/ckeditor.old/lang/vi.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/zh-cn.js b/branding/default/js/ckeditor.old/lang/zh-cn.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/lang/zh.js b/branding/default/js/ckeditor.old/lang/zh.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/plugins/icons.png b/branding/default/js/ckeditor.old/plugins/icons.png old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/ajax.html b/branding/default/js/ckeditor.old/samples/ajax.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/api.html b/branding/default/js/ckeditor.old/samples/api.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/appendto.html b/branding/default/js/ckeditor.old/samples/appendto.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/datafiltering.html b/branding/default/js/ckeditor.old/samples/datafiltering.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/divreplace.html b/branding/default/js/ckeditor.old/samples/divreplace.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/index.html b/branding/default/js/ckeditor.old/samples/index.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/inlineall.html b/branding/default/js/ckeditor.old/samples/inlineall.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/inlinebycode.html b/branding/default/js/ckeditor.old/samples/inlinebycode.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/readonly.html b/branding/default/js/ckeditor.old/samples/readonly.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/replacebyclass.html b/branding/default/js/ckeditor.old/samples/replacebyclass.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/replacebycode.html b/branding/default/js/ckeditor.old/samples/replacebycode.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/sample.css b/branding/default/js/ckeditor.old/samples/sample.css old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/sample.js b/branding/default/js/ckeditor.old/samples/sample.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/sample_posteddata.php b/branding/default/js/ckeditor.old/samples/sample_posteddata.php old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/tabindex.html b/branding/default/js/ckeditor.old/samples/tabindex.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/uicolor.html b/branding/default/js/ckeditor.old/samples/uicolor.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/uilanguages.html b/branding/default/js/ckeditor.old/samples/uilanguages.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/samples/xhtmlstyle.html b/branding/default/js/ckeditor.old/samples/xhtmlstyle.html old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor.old/styles.js b/branding/default/js/ckeditor.old/styles.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor/CHANGES.md b/branding/default/js/ckeditor/CHANGES.md old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor/LICENSE.md b/branding/default/js/ckeditor/LICENSE.md old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor/README.md b/branding/default/js/ckeditor/README.md old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor/adapters/jquery.js b/branding/default/js/ckeditor/adapters/jquery.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/build-config.js b/branding/default/js/ckeditor/build-config.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor/images/spacer.gif b/branding/default/js/ckeditor/images/spacer.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/browse.php b/branding/default/js/ckeditor/kcfinder/browse.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/config.php b/branding/default/js/ckeditor/kcfinder/config.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/core/.htaccess b/branding/default/js/ckeditor/kcfinder/core/.htaccess old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/core/autoload.php b/branding/default/js/ckeditor/kcfinder/core/autoload.php old mode 100755 new mode 100644 index 1b0707f1..fac72c12 --- a/branding/default/js/ckeditor/kcfinder/core/autoload.php +++ b/branding/default/js/ckeditor/kcfinder/core/autoload.php @@ -12,7 +12,7 @@ * @link http://kcfinder.sunhater.com */ -function __autoload($class) { +spl_autoload_register(function($class) { if ($class == "uploader") require "core/uploader.php"; elseif ($class == "browser") @@ -23,6 +23,6 @@ function __autoload($class) { require "lib/class_$class.php"; elseif (file_exists("lib/helper_$class.php")) require "lib/helper_$class.php"; -} +}); ?> \ No newline at end of file diff --git a/branding/default/js/ckeditor/kcfinder/core/browser.php b/branding/default/js/ckeditor/kcfinder/core/browser.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/core/types/type_img.php b/branding/default/js/ckeditor/kcfinder/core/types/type_img.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/core/types/type_mime.php b/branding/default/js/ckeditor/kcfinder/core/types/type_mime.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/core/uploader.php b/branding/default/js/ckeditor/kcfinder/core/uploader.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/css/index.php b/branding/default/js/ckeditor/kcfinder/css/index.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/doc/.htaccess b/branding/default/js/ckeditor/kcfinder/doc/.htaccess old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/doc/Changelog b/branding/default/js/ckeditor/kcfinder/doc/Changelog old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/doc/INSTALL b/branding/default/js/ckeditor/kcfinder/doc/INSTALL old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/doc/LICENSE.GPL b/branding/default/js/ckeditor/kcfinder/doc/LICENSE.GPL old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/doc/LICENSE.LGPL b/branding/default/js/ckeditor/kcfinder/doc/LICENSE.LGPL old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/doc/README b/branding/default/js/ckeditor/kcfinder/doc/README old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/browser/0bject.js b/branding/default/js/ckeditor/kcfinder/js/browser/0bject.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/browser/clipboard.js b/branding/default/js/ckeditor/kcfinder/js/browser/clipboard.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/browser/files.js b/branding/default/js/ckeditor/kcfinder/js/browser/files.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/browser/folders.js b/branding/default/js/ckeditor/kcfinder/js/browser/folders.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/browser/index.php b/branding/default/js/ckeditor/kcfinder/js/browser/index.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/browser/init.js b/branding/default/js/ckeditor/kcfinder/js/browser/init.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/browser/misc.js b/branding/default/js/ckeditor/kcfinder/js/browser/misc.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/browser/settings.js b/branding/default/js/ckeditor/kcfinder/js/browser/settings.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/browser/toolbar.js b/branding/default/js/ckeditor/kcfinder/js/browser/toolbar.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/helper.js b/branding/default/js/ckeditor/kcfinder/js/helper.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/jquery.drag.js b/branding/default/js/ckeditor/kcfinder/js/jquery.drag.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/jquery.js b/branding/default/js/ckeditor/kcfinder/js/jquery.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js/jquery.rightClick.js b/branding/default/js/ckeditor/kcfinder/js/jquery.rightClick.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/js_localize.php b/branding/default/js/ckeditor/kcfinder/js_localize.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/.htaccess b/branding/default/js/ckeditor/kcfinder/lang/.htaccess old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/bg.php b/branding/default/js/ckeditor/kcfinder/lang/bg.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/cs.php b/branding/default/js/ckeditor/kcfinder/lang/cs.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/de.php b/branding/default/js/ckeditor/kcfinder/lang/de.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/en.php b/branding/default/js/ckeditor/kcfinder/lang/en.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/es.php b/branding/default/js/ckeditor/kcfinder/lang/es.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/fr.php b/branding/default/js/ckeditor/kcfinder/lang/fr.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/hu.php b/branding/default/js/ckeditor/kcfinder/lang/hu.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/it.php b/branding/default/js/ckeditor/kcfinder/lang/it.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/pl.php b/branding/default/js/ckeditor/kcfinder/lang/pl.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/pt.php b/branding/default/js/ckeditor/kcfinder/lang/pt.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lang/ru.php b/branding/default/js/ckeditor/kcfinder/lang/ru.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lib/.htaccess b/branding/default/js/ckeditor/kcfinder/lib/.htaccess old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lib/class_gd.php b/branding/default/js/ckeditor/kcfinder/lib/class_gd.php old mode 100755 new mode 100644 index 9a36e4f5..60952321 --- a/branding/default/js/ckeditor/kcfinder/lib/class_gd.php +++ b/branding/default/js/ckeditor/kcfinder/lib/class_gd.php @@ -52,8 +52,8 @@ protected function build_image($image) { $height = @imagesy($image); } elseif (is_array($image)) { - list($key, $width) = each($image); - list($key, $height) = each($image); + $width = $image[0]; + $height = $image[1]; $image = imagecreatetruecolor($width, $height); } elseif (false !== (list($width, $height, $type) = @getimagesize($image))) { diff --git a/branding/default/js/ckeditor/kcfinder/lib/class_input.php b/branding/default/js/ckeditor/kcfinder/lib/class_input.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lib/class_zipFolder.php b/branding/default/js/ckeditor/kcfinder/lib/class_zipFolder.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lib/helper_dir.php b/branding/default/js/ckeditor/kcfinder/lib/helper_dir.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lib/helper_file.php b/branding/default/js/ckeditor/kcfinder/lib/helper_file.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lib/helper_httpCache.php b/branding/default/js/ckeditor/kcfinder/lib/helper_httpCache.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lib/helper_path.php b/branding/default/js/ckeditor/kcfinder/lib/helper_path.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/lib/helper_text.php b/branding/default/js/ckeditor/kcfinder/lib/helper_text.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/about.txt b/branding/default/js/ckeditor/kcfinder/themes/oxygen/about.txt old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/..png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/..png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/.image.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/.image.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/avi.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/avi.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/bat.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/bat.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/bmp.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/bmp.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/bz2.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/bz2.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/ccd.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/ccd.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/cgi.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/cgi.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/com.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/com.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/csh.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/csh.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/cue.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/cue.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/deb.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/deb.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/dll.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/dll.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/doc.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/doc.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/docx.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/docx.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/exe.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/exe.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/fla.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/fla.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/flv.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/flv.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/fon.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/fon.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/gif.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/gif.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/gz.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/gz.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/htm.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/htm.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/html.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/html.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/ini.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/ini.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/iso.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/iso.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/jar.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/jar.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/java.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/java.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/jpeg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/jpeg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/jpg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/jpg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/js.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/js.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mds.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mds.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mdx.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mdx.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mid.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mid.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/midi.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/midi.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mkv.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mkv.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mov.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mov.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mp3.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mp3.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mpeg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mpeg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mpg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/mpg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/nfo.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/nfo.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/nrg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/nrg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/ogg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/ogg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/pdf.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/pdf.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/php.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/php.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/phps.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/phps.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/pl.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/pl.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/pm.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/pm.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/png.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/png.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/ppt.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/ppt.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/pptx.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/pptx.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/qt.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/qt.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/rpm.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/rpm.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/rtf.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/rtf.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/sh.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/sh.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/srt.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/srt.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/sub.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/sub.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/swf.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/swf.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/tgz.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/tgz.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/tif.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/tif.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/tiff.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/tiff.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/torrent.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/torrent.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/ttf.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/ttf.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/txt.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/txt.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/wav.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/wav.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/wma.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/wma.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/xls.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/xls.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/xlsx.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/xlsx.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/zip.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/big/zip.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/..png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/..png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/.image.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/.image.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/avi.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/avi.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/bat.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/bat.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/bmp.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/bmp.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/bz2.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/bz2.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/ccd.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/ccd.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/cgi.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/cgi.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/com.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/com.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/csh.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/csh.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/cue.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/cue.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/deb.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/deb.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/dll.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/dll.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/doc.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/doc.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/docx.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/docx.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/exe.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/exe.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/fla.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/fla.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/flv.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/flv.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/fon.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/fon.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/gif.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/gif.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/gz.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/gz.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/htm.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/htm.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/html.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/html.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/ini.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/ini.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/iso.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/iso.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/jar.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/jar.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/java.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/java.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/jpeg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/jpeg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/jpg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/jpg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/js.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/js.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mds.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mds.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mdx.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mdx.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mid.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mid.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/midi.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/midi.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mkv.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mkv.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mov.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mov.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mp3.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mp3.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mpeg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mpeg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mpg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/mpg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/nfo.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/nfo.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/nrg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/nrg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/ogg.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/ogg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/pdf.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/pdf.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/php.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/php.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/phps.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/phps.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/pl.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/pl.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/pm.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/pm.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/png.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/png.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/ppt.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/ppt.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/pptx.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/pptx.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/qt.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/qt.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/rpm.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/rpm.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/rtf.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/rtf.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/sh.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/sh.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/srt.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/srt.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/sub.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/sub.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/swf.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/swf.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/tgz.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/tgz.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/tif.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/tif.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/tiff.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/tiff.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/torrent.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/torrent.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/ttf.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/ttf.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/txt.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/txt.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/wav.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/wav.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/wma.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/wma.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/xls.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/xls.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/xlsx.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/xlsx.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/zip.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/files/small/zip.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/about.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/about.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/clipboard-add.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/clipboard-add.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/clipboard-clear.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/clipboard-clear.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/clipboard.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/clipboard.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/copy.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/copy.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/delete.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/delete.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/download.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/download.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/folder-new.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/folder-new.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/maximize.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/maximize.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/move.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/move.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/refresh.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/refresh.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/rename.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/rename.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/select.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/select.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/settings.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/settings.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/upload.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/upload.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/view.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/icons/view.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/loading.gif b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/loading.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/tree/denied.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/tree/denied.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/tree/folder.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/tree/folder.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/tree/folder_current.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/tree/folder_current.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/tree/minus.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/tree/minus.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/tree/plus.png b/branding/default/js/ckeditor/kcfinder/themes/oxygen/img/tree/plus.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/init.js b/branding/default/js/ckeditor/kcfinder/themes/oxygen/init.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/themes/oxygen/style.css b/branding/default/js/ckeditor/kcfinder/themes/oxygen/style.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/tpl/.htaccess b/branding/default/js/ckeditor/kcfinder/tpl/.htaccess old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/tpl/tpl__css.php b/branding/default/js/ckeditor/kcfinder/tpl/tpl__css.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/tpl/tpl__javascript.php b/branding/default/js/ckeditor/kcfinder/tpl/tpl__javascript.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/tpl/tpl_browser.php b/branding/default/js/ckeditor/kcfinder/tpl/tpl_browser.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/tpl/tpl_chDir.php b/branding/default/js/ckeditor/kcfinder/tpl/tpl_chDir.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/tpl/tpl_deleteDir.php b/branding/default/js/ckeditor/kcfinder/tpl/tpl_deleteDir.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/tpl/tpl_error.php b/branding/default/js/ckeditor/kcfinder/tpl/tpl_error.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/tpl/tpl_expand.php b/branding/default/js/ckeditor/kcfinder/tpl/tpl_expand.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/tpl/tpl_init.php b/branding/default/js/ckeditor/kcfinder/tpl/tpl_init.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/tpl/tpl_renameDir.php b/branding/default/js/ckeditor/kcfinder/tpl/tpl_renameDir.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/upload.php b/branding/default/js/ckeditor/kcfinder/upload.php old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/kcfinder/upload/.htaccess b/branding/default/js/ckeditor/kcfinder/upload/.htaccess old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/_languages.js b/branding/default/js/ckeditor/lang/_languages.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/_translationstatus.txt b/branding/default/js/ckeditor/lang/_translationstatus.txt old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/af.js b/branding/default/js/ckeditor/lang/af.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/ar.js b/branding/default/js/ckeditor/lang/ar.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/bg.js b/branding/default/js/ckeditor/lang/bg.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/bn.js b/branding/default/js/ckeditor/lang/bn.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/bs.js b/branding/default/js/ckeditor/lang/bs.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/ca.js b/branding/default/js/ckeditor/lang/ca.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/cs.js b/branding/default/js/ckeditor/lang/cs.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/cy.js b/branding/default/js/ckeditor/lang/cy.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/da.js b/branding/default/js/ckeditor/lang/da.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/de.js b/branding/default/js/ckeditor/lang/de.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/el.js b/branding/default/js/ckeditor/lang/el.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/en-au.js b/branding/default/js/ckeditor/lang/en-au.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/en-ca.js b/branding/default/js/ckeditor/lang/en-ca.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/en-gb.js b/branding/default/js/ckeditor/lang/en-gb.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/en.js b/branding/default/js/ckeditor/lang/en.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/eo.js b/branding/default/js/ckeditor/lang/eo.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/es.js b/branding/default/js/ckeditor/lang/es.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/et.js b/branding/default/js/ckeditor/lang/et.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/eu.js b/branding/default/js/ckeditor/lang/eu.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/fa.js b/branding/default/js/ckeditor/lang/fa.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/fi.js b/branding/default/js/ckeditor/lang/fi.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/fo.js b/branding/default/js/ckeditor/lang/fo.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/fr-ca.js b/branding/default/js/ckeditor/lang/fr-ca.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/fr.js b/branding/default/js/ckeditor/lang/fr.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/gl.js b/branding/default/js/ckeditor/lang/gl.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/gu.js b/branding/default/js/ckeditor/lang/gu.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/he.js b/branding/default/js/ckeditor/lang/he.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/hi.js b/branding/default/js/ckeditor/lang/hi.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/hr.js b/branding/default/js/ckeditor/lang/hr.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/hu.js b/branding/default/js/ckeditor/lang/hu.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/is.js b/branding/default/js/ckeditor/lang/is.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/it.js b/branding/default/js/ckeditor/lang/it.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/ja.js b/branding/default/js/ckeditor/lang/ja.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/ka.js b/branding/default/js/ckeditor/lang/ka.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/km.js b/branding/default/js/ckeditor/lang/km.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/ko.js b/branding/default/js/ckeditor/lang/ko.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/lt.js b/branding/default/js/ckeditor/lang/lt.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/lv.js b/branding/default/js/ckeditor/lang/lv.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/mn.js b/branding/default/js/ckeditor/lang/mn.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/ms.js b/branding/default/js/ckeditor/lang/ms.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/nb.js b/branding/default/js/ckeditor/lang/nb.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/nl.js b/branding/default/js/ckeditor/lang/nl.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/no.js b/branding/default/js/ckeditor/lang/no.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/pl.js b/branding/default/js/ckeditor/lang/pl.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/pt-br.js b/branding/default/js/ckeditor/lang/pt-br.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/pt.js b/branding/default/js/ckeditor/lang/pt.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/ro.js b/branding/default/js/ckeditor/lang/ro.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/ru.js b/branding/default/js/ckeditor/lang/ru.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/sk.js b/branding/default/js/ckeditor/lang/sk.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/sl.js b/branding/default/js/ckeditor/lang/sl.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/sr-latn.js b/branding/default/js/ckeditor/lang/sr-latn.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/sr.js b/branding/default/js/ckeditor/lang/sr.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/sv.js b/branding/default/js/ckeditor/lang/sv.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/th.js b/branding/default/js/ckeditor/lang/th.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/tr.js b/branding/default/js/ckeditor/lang/tr.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/uk.js b/branding/default/js/ckeditor/lang/uk.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/vi.js b/branding/default/js/ckeditor/lang/vi.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/zh-cn.js b/branding/default/js/ckeditor/lang/zh-cn.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/lang/zh.js b/branding/default/js/ckeditor/lang/zh.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/MediaEmbed/dialogs/mediaembed.html b/branding/default/js/ckeditor/plugins/MediaEmbed/dialogs/mediaembed.html old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/MediaEmbed/images/icon.gif b/branding/default/js/ckeditor/plugins/MediaEmbed/images/icon.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/MediaEmbed/plugin.js b/branding/default/js/ckeditor/plugins/MediaEmbed/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/branding/default/js/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/a11yhelp/lang/en.js b/branding/default/js/ckeditor/plugins/a11yhelp/lang/en.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/a11yhelp/lang/he.js b/branding/default/js/ckeditor/plugins/a11yhelp/lang/he.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/about/dialogs/about.js b/branding/default/js/ckeditor/plugins/about/dialogs/about.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png b/branding/default/js/ckeditor/plugins/about/dialogs/logo_ckeditor.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/adobeair/plugin.js b/branding/default/js/ckeditor/plugins/adobeair/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/ajax/plugin.js b/branding/default/js/ckeditor/plugins/ajax/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/autogrow/plugin.js b/branding/default/js/ckeditor/plugins/autogrow/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/bbcode/plugin.js b/branding/default/js/ckeditor/plugins/bbcode/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/clipboard/dialogs/paste.js b/branding/default/js/ckeditor/plugins/clipboard/dialogs/paste.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/colordialog/dialogs/colordialog.js b/branding/default/js/ckeditor/plugins/colordialog/dialogs/colordialog.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/devtools/lang/en.js b/branding/default/js/ckeditor/plugins/devtools/lang/en.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/devtools/plugin.js b/branding/default/js/ckeditor/plugins/devtools/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/dialog/dialogDefinition.js b/branding/default/js/ckeditor/plugins/dialog/dialogDefinition.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/div/dialogs/div.js b/branding/default/js/ckeditor/plugins/div/dialogs/div.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/docprops/dialogs/docprops.js b/branding/default/js/ckeditor/plugins/docprops/dialogs/docprops.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/docprops/plugin.js b/branding/default/js/ckeditor/plugins/docprops/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/find/dialogs/find.js b/branding/default/js/ckeditor/plugins/find/dialogs/find.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/flash/dialogs/flash.js b/branding/default/js/ckeditor/plugins/flash/dialogs/flash.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/flash/images/placeholder.png b/branding/default/js/ckeditor/plugins/flash/images/placeholder.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/forms/dialogs/button.js b/branding/default/js/ckeditor/plugins/forms/dialogs/button.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/forms/dialogs/checkbox.js b/branding/default/js/ckeditor/plugins/forms/dialogs/checkbox.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/forms/dialogs/form.js b/branding/default/js/ckeditor/plugins/forms/dialogs/form.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/forms/dialogs/hiddenfield.js b/branding/default/js/ckeditor/plugins/forms/dialogs/hiddenfield.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/forms/dialogs/radio.js b/branding/default/js/ckeditor/plugins/forms/dialogs/radio.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/forms/dialogs/select.js b/branding/default/js/ckeditor/plugins/forms/dialogs/select.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/forms/dialogs/textarea.js b/branding/default/js/ckeditor/plugins/forms/dialogs/textarea.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/forms/dialogs/textfield.js b/branding/default/js/ckeditor/plugins/forms/dialogs/textfield.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/forms/images/hiddenfield.gif b/branding/default/js/ckeditor/plugins/forms/images/hiddenfield.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/iframe/dialogs/iframe.js b/branding/default/js/ckeditor/plugins/iframe/dialogs/iframe.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/iframe/images/placeholder.png b/branding/default/js/ckeditor/plugins/iframe/images/placeholder.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/iframedialog/plugin.js b/branding/default/js/ckeditor/plugins/iframedialog/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/image/dialogs/image.js b/branding/default/js/ckeditor/plugins/image/dialogs/image.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/link/dialogs/anchor.js b/branding/default/js/ckeditor/plugins/link/dialogs/anchor.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/link/dialogs/link.js b/branding/default/js/ckeditor/plugins/link/dialogs/link.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/link/images/anchor.gif b/branding/default/js/ckeditor/plugins/link/images/anchor.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/liststyle/dialogs/liststyle.js b/branding/default/js/ckeditor/plugins/liststyle/dialogs/liststyle.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/pagebreak/images/pagebreak.gif b/branding/default/js/ckeditor/plugins/pagebreak/images/pagebreak.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/pastefromword/filter/default.js b/branding/default/js/ckeditor/plugins/pastefromword/filter/default.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/pastetext/dialogs/pastetext.js b/branding/default/js/ckeditor/plugins/pastetext/dialogs/pastetext.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/placeholder/dialogs/placeholder.js b/branding/default/js/ckeditor/plugins/placeholder/dialogs/placeholder.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/placeholder/lang/en.js b/branding/default/js/ckeditor/plugins/placeholder/lang/en.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/placeholder/lang/he.js b/branding/default/js/ckeditor/plugins/placeholder/lang/he.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/placeholder/placeholder.gif b/branding/default/js/ckeditor/plugins/placeholder/placeholder.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/placeholder/plugin.js b/branding/default/js/ckeditor/plugins/placeholder/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/scayt/dialogs/options.js b/branding/default/js/ckeditor/plugins/scayt/dialogs/options.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/scayt/dialogs/toolbar.css b/branding/default/js/ckeditor/plugins/scayt/dialogs/toolbar.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/showblocks/images/block_address.png b/branding/default/js/ckeditor/plugins/showblocks/images/block_address.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/showblocks/images/block_blockquote.png b/branding/default/js/ckeditor/plugins/showblocks/images/block_blockquote.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/showblocks/images/block_div.png b/branding/default/js/ckeditor/plugins/showblocks/images/block_div.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/showblocks/images/block_h1.png b/branding/default/js/ckeditor/plugins/showblocks/images/block_h1.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/showblocks/images/block_h2.png b/branding/default/js/ckeditor/plugins/showblocks/images/block_h2.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/showblocks/images/block_h3.png b/branding/default/js/ckeditor/plugins/showblocks/images/block_h3.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/showblocks/images/block_h4.png b/branding/default/js/ckeditor/plugins/showblocks/images/block_h4.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/showblocks/images/block_h5.png b/branding/default/js/ckeditor/plugins/showblocks/images/block_h5.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/showblocks/images/block_h6.png b/branding/default/js/ckeditor/plugins/showblocks/images/block_h6.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/showblocks/images/block_p.png b/branding/default/js/ckeditor/plugins/showblocks/images/block_p.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/showblocks/images/block_pre.png b/branding/default/js/ckeditor/plugins/showblocks/images/block_pre.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/dialogs/smiley.js b/branding/default/js/ckeditor/plugins/smiley/dialogs/smiley.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/angel_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/angel_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/angry_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/angry_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/broken_heart.gif b/branding/default/js/ckeditor/plugins/smiley/images/broken_heart.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/confused_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/confused_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/cry_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/cry_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/devil_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/devil_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/embaressed_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/embaressed_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/envelope.gif b/branding/default/js/ckeditor/plugins/smiley/images/envelope.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/heart.gif b/branding/default/js/ckeditor/plugins/smiley/images/heart.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/kiss.gif b/branding/default/js/ckeditor/plugins/smiley/images/kiss.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/lightbulb.gif b/branding/default/js/ckeditor/plugins/smiley/images/lightbulb.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/omg_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/omg_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/regular_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/regular_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/sad_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/sad_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/shades_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/shades_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/teeth_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/teeth_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/thumbs_down.gif b/branding/default/js/ckeditor/plugins/smiley/images/thumbs_down.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/thumbs_up.gif b/branding/default/js/ckeditor/plugins/smiley/images/thumbs_up.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/tounge_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/tounge_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/smiley/images/wink_smile.gif b/branding/default/js/ckeditor/plugins/smiley/images/wink_smile.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/specialchar/dialogs/specialchar.js b/branding/default/js/ckeditor/plugins/specialchar/dialogs/specialchar.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/specialchar/lang/en.js b/branding/default/js/ckeditor/plugins/specialchar/lang/en.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/styles/styles/default.js b/branding/default/js/ckeditor/plugins/styles/styles/default.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/stylesheetparser/plugin.js b/branding/default/js/ckeditor/plugins/stylesheetparser/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/table/dialogs/table.js b/branding/default/js/ckeditor/plugins/table/dialogs/table.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/tableresize/plugin.js b/branding/default/js/ckeditor/plugins/tableresize/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/tabletools/dialogs/tableCell.js b/branding/default/js/ckeditor/plugins/tabletools/dialogs/tableCell.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/templates/dialogs/templates.js b/branding/default/js/ckeditor/plugins/templates/dialogs/templates.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/templates/templates/default.js b/branding/default/js/ckeditor/plugins/templates/templates/default.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/templates/templates/images/template1.gif b/branding/default/js/ckeditor/plugins/templates/templates/images/template1.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/templates/templates/images/template2.gif b/branding/default/js/ckeditor/plugins/templates/templates/images/template2.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/templates/templates/images/template3.gif b/branding/default/js/ckeditor/plugins/templates/templates/images/template3.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/uicolor/dialogs/uicolor.js b/branding/default/js/ckeditor/plugins/uicolor/dialogs/uicolor.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/uicolor/lang/en.js b/branding/default/js/ckeditor/plugins/uicolor/lang/en.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/uicolor/lang/he.js b/branding/default/js/ckeditor/plugins/uicolor/lang/he.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/uicolor/plugin.js b/branding/default/js/ckeditor/plugins/uicolor/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/uicolor/uicolor.gif b/branding/default/js/ckeditor/plugins/uicolor/uicolor.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/uicolor/yui/assets/hue_bg.png b/branding/default/js/ckeditor/plugins/uicolor/yui/assets/hue_bg.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png b/branding/default/js/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/uicolor/yui/assets/picker_mask.png b/branding/default/js/ckeditor/plugins/uicolor/yui/assets/picker_mask.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png b/branding/default/js/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/uicolor/yui/assets/yui.css b/branding/default/js/ckeditor/plugins/uicolor/yui/assets/yui.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/uicolor/yui/yui.js b/branding/default/js/ckeditor/plugins/uicolor/yui/yui.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/wsc/dialogs/ciframe.html b/branding/default/js/ckeditor/plugins/wsc/dialogs/ciframe.html old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/branding/default/js/ckeditor/plugins/wsc/dialogs/tmpFrameset.html old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/wsc/dialogs/wsc.css b/branding/default/js/ckeditor/plugins/wsc/dialogs/wsc.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/wsc/dialogs/wsc.js b/branding/default/js/ckeditor/plugins/wsc/dialogs/wsc.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/plugins/xml/plugin.js b/branding/default/js/ckeditor/plugins/xml/plugin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/dialog.css b/branding/default/js/ckeditor/skins/kama/dialog.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/editor.css b/branding/default/js/ckeditor/skins/kama/editor.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/icons.png b/branding/default/js/ckeditor/skins/kama/icons.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/icons_rtl.png b/branding/default/js/ckeditor/skins/kama/icons_rtl.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/images/dialog_sides.gif b/branding/default/js/ckeditor/skins/kama/images/dialog_sides.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/images/dialog_sides.png b/branding/default/js/ckeditor/skins/kama/images/dialog_sides.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/images/dialog_sides_rtl.png b/branding/default/js/ckeditor/skins/kama/images/dialog_sides_rtl.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/images/mini.gif b/branding/default/js/ckeditor/skins/kama/images/mini.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/images/noimage.png b/branding/default/js/ckeditor/skins/kama/images/noimage.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/images/sprites.png b/branding/default/js/ckeditor/skins/kama/images/sprites.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/images/sprites_ie6.png b/branding/default/js/ckeditor/skins/kama/images/sprites_ie6.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/images/toolbar_start.gif b/branding/default/js/ckeditor/skins/kama/images/toolbar_start.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/skin.js b/branding/default/js/ckeditor/skins/kama/skin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/kama/templates.css b/branding/default/js/ckeditor/skins/kama/templates.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/dialog.css b/branding/default/js/ckeditor/skins/office2003/dialog.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/editor.css b/branding/default/js/ckeditor/skins/office2003/editor.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/icons.png b/branding/default/js/ckeditor/skins/office2003/icons.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/icons_rtl.png b/branding/default/js/ckeditor/skins/office2003/icons_rtl.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/images/dialog_sides.gif b/branding/default/js/ckeditor/skins/office2003/images/dialog_sides.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/images/dialog_sides.png b/branding/default/js/ckeditor/skins/office2003/images/dialog_sides.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/images/dialog_sides_rtl.png b/branding/default/js/ckeditor/skins/office2003/images/dialog_sides_rtl.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/images/mini.gif b/branding/default/js/ckeditor/skins/office2003/images/mini.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/images/noimage.png b/branding/default/js/ckeditor/skins/office2003/images/noimage.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/images/sprites.png b/branding/default/js/ckeditor/skins/office2003/images/sprites.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/images/sprites_ie6.png b/branding/default/js/ckeditor/skins/office2003/images/sprites_ie6.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/skin.js b/branding/default/js/ckeditor/skins/office2003/skin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/office2003/templates.css b/branding/default/js/ckeditor/skins/office2003/templates.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/dialog.css b/branding/default/js/ckeditor/skins/v2/dialog.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/editor.css b/branding/default/js/ckeditor/skins/v2/editor.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/icons.png b/branding/default/js/ckeditor/skins/v2/icons.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/icons_rtl.png b/branding/default/js/ckeditor/skins/v2/icons_rtl.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/images/dialog_sides.gif b/branding/default/js/ckeditor/skins/v2/images/dialog_sides.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/images/dialog_sides.png b/branding/default/js/ckeditor/skins/v2/images/dialog_sides.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/images/dialog_sides_rtl.png b/branding/default/js/ckeditor/skins/v2/images/dialog_sides_rtl.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/images/mini.gif b/branding/default/js/ckeditor/skins/v2/images/mini.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/images/noimage.png b/branding/default/js/ckeditor/skins/v2/images/noimage.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/images/sprites.png b/branding/default/js/ckeditor/skins/v2/images/sprites.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/images/sprites_ie6.png b/branding/default/js/ckeditor/skins/v2/images/sprites_ie6.png old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/images/toolbar_start.gif b/branding/default/js/ckeditor/skins/v2/images/toolbar_start.gif old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/skin.js b/branding/default/js/ckeditor/skins/v2/skin.js old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/skins/v2/templates.css b/branding/default/js/ckeditor/skins/v2/templates.css old mode 100755 new mode 100644 diff --git a/branding/default/js/ckeditor/styles.js b/branding/default/js/ckeditor/styles.js old mode 100644 new mode 100755 diff --git a/branding/default/js/ckeditor/themes/default/theme.js b/branding/default/js/ckeditor/themes/default/theme.js old mode 100755 new mode 100644 diff --git a/branding/default/js/dashboard.js b/branding/default/js/dashboard.js old mode 100644 new mode 100755 diff --git a/branding/default/js/data.user_fields.js b/branding/default/js/data.user_fields.js old mode 100644 new mode 100755 diff --git a/branding/default/js/date.js b/branding/default/js/date.js old mode 100644 new mode 100755 diff --git a/branding/default/js/datePicker.js b/branding/default/js/datePicker.js old mode 100644 new mode 100755 diff --git a/branding/default/js/form.address.js b/branding/default/js/form.address.js old mode 100644 new mode 100755 diff --git a/branding/default/js/form.blog.js b/branding/default/js/form.blog.js old mode 100644 new mode 100755 diff --git a/branding/default/js/form.coupon.js b/branding/default/js/form.coupon.js old mode 100644 new mode 100755 diff --git a/branding/default/js/form.email.js b/branding/default/js/form.email.js old mode 100644 new mode 100755 diff --git a/branding/default/js/form.field.js b/branding/default/js/form.field.js old mode 100644 new mode 100755 diff --git a/branding/default/js/form.js b/branding/default/js/form.js old mode 100644 new mode 100755 diff --git a/branding/default/js/form.plan.js b/branding/default/js/form.plan.js old mode 100644 new mode 100755 diff --git a/branding/default/js/form.rss_feed.js b/branding/default/js/form.rss_feed.js old mode 100644 new mode 100755 diff --git a/branding/default/js/form.send_email.js b/branding/default/js/form.send_email.js old mode 100644 new mode 100755 diff --git a/branding/default/js/form.transaction.js b/branding/default/js/form.transaction.js old mode 100644 new mode 100755 diff --git a/branding/default/js/image_gallery.js b/branding/default/js/image_gallery.js old mode 100644 new mode 100755 diff --git a/branding/default/js/image_gallery_form.js b/branding/default/js/image_gallery_form.js old mode 100644 new mode 100755 diff --git a/branding/default/js/jquery-1.4.2.js b/branding/default/js/jquery-1.4.2.js old mode 100644 new mode 100755 diff --git a/branding/default/js/jquery.quicksearch.js b/branding/default/js/jquery.quicksearch.js old mode 100644 new mode 100755 diff --git a/branding/default/js/jquery.simplemodal.1.4.min.js b/branding/default/js/jquery.simplemodal.1.4.min.js old mode 100644 new mode 100755 diff --git a/branding/default/js/jquery.sparkline.js b/branding/default/js/jquery.sparkline.js old mode 100644 new mode 100755 diff --git a/branding/default/js/menu_manager.js b/branding/default/js/menu_manager.js old mode 100644 new mode 100755 diff --git a/branding/default/js/product.js b/branding/default/js/product.js old mode 100644 new mode 100755 diff --git a/branding/default/js/product_option.js b/branding/default/js/product_option.js old mode 100644 new mode 100755 diff --git a/branding/default/js/recurring.js b/branding/default/js/recurring.js old mode 100644 new mode 100755 diff --git a/branding/default/js/report.invoice.js b/branding/default/js/report.invoice.js old mode 100644 new mode 100755 diff --git a/branding/default/js/report.products.js b/branding/default/js/report.products.js old mode 100644 new mode 100755 diff --git a/branding/default/js/settings.js b/branding/default/js/settings.js old mode 100644 new mode 100755 diff --git a/branding/default/js/sortable.js b/branding/default/js/sortable.js old mode 100644 new mode 100755 diff --git a/branding/default/js/theme_editor.js b/branding/default/js/theme_editor.js old mode 100644 new mode 100755 diff --git a/branding/default/js/tiptip.min.js b/branding/default/js/tiptip.min.js old mode 100644 new mode 100755 diff --git a/branding/default/js/universal.js b/branding/default/js/universal.js old mode 100644 new mode 100755 diff --git a/index.php b/index.php old mode 100755 new mode 100644 diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php old mode 100755 new mode 100644 diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php old mode 100755 new mode 100644 diff --git a/system/core/Common.php b/system/core/Common.php old mode 100755 new mode 100644 index 07534c51..009caaba --- a/system/core/Common.php +++ b/system/core/Common.php @@ -253,8 +253,8 @@ function &get_config($replace = array()) } } } - - return $_config[0] =& $config; + $this_config = $_config[0] =& $config; + return $this_config; } } @@ -561,4 +561,4 @@ function html_escape($var) } /* End of file Common.php */ -/* Location: ./system/core/Common.php */ \ No newline at end of file +/* Location: ./system/core/Common.php */ diff --git a/system/core/Config.php b/system/core/Config.php old mode 100755 new mode 100644 diff --git a/system/core/Controller.php b/system/core/Controller.php old mode 100755 new mode 100644 diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php old mode 100755 new mode 100644 diff --git a/system/core/Hooks.php b/system/core/Hooks.php old mode 100755 new mode 100644 diff --git a/system/core/Input.php b/system/core/Input.php old mode 100755 new mode 100644 diff --git a/system/core/Lang.php b/system/core/Lang.php old mode 100755 new mode 100644 diff --git a/system/core/Loader.php b/system/core/Loader.php old mode 100755 new mode 100644 diff --git a/system/core/Model.php b/system/core/Model.php old mode 100755 new mode 100644 diff --git a/system/core/Output.php b/system/core/Output.php old mode 100755 new mode 100644 diff --git a/system/core/Router.php b/system/core/Router.php old mode 100755 new mode 100644 diff --git a/system/core/Security.php b/system/core/Security.php old mode 100755 new mode 100644 index 00089d76..81162047 --- a/system/core/Security.php +++ b/system/core/Security.php @@ -269,7 +269,7 @@ public function xss_clean($str, $is_image = FALSE) */ if (is_array($str)) { - while (list($key) = each($str)) + foreach($str as $key) { $str[$key] = $this->xss_clean($str[$key]); } diff --git a/system/core/URI.php b/system/core/URI.php old mode 100755 new mode 100644 diff --git a/system/core/Utf8.php b/system/core/Utf8.php old mode 100755 new mode 100644 diff --git a/system/core/index.html b/system/core/index.html old mode 100755 new mode 100644 diff --git a/system/database/DB.php b/system/database/DB.php old mode 100755 new mode 100644 diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php old mode 100755 new mode 100644 diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php old mode 100755 new mode 100644 diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php old mode 100755 new mode 100644 diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php old mode 100755 new mode 100644 diff --git a/system/database/DB_result.php b/system/database/DB_result.php old mode 100755 new mode 100644 diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/index.html b/system/database/drivers/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/mssql/index.html b/system/database/drivers/mssql/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysql/index.html b/system/database/drivers/mysql/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysqli/index.html b/system/database/drivers/mysqli/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/oci8/index.html b/system/database/drivers/oci8/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/odbc/index.html b/system/database/drivers/odbc/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/postgre/index.html b/system/database/drivers/postgre/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlite/index.html b/system/database/drivers/sqlite/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlsrv/index.html b/system/database/drivers/sqlsrv/index.html old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlsrv/sqlsrv_driver.php b/system/database/drivers/sqlsrv/sqlsrv_driver.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlsrv/sqlsrv_forge.php b/system/database/drivers/sqlsrv/sqlsrv_forge.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlsrv/sqlsrv_result.php b/system/database/drivers/sqlsrv/sqlsrv_result.php old mode 100755 new mode 100644 diff --git a/system/database/drivers/sqlsrv/sqlsrv_utility.php b/system/database/drivers/sqlsrv/sqlsrv_utility.php old mode 100755 new mode 100644 diff --git a/system/database/index.html b/system/database/index.html old mode 100755 new mode 100644 diff --git a/system/fonts/index.html b/system/fonts/index.html old mode 100755 new mode 100644 diff --git a/system/fonts/texb.ttf b/system/fonts/texb.ttf old mode 100755 new mode 100644 diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/email_helper.php b/system/helpers/email_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/index.html b/system/helpers/index.html old mode 100755 new mode 100644 diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/language_helper.php b/system/helpers/language_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/number_helper.php b/system/helpers/number_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/path_helper.php b/system/helpers/path_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php old mode 100755 new mode 100644 diff --git a/system/helpers/xml_helper.php b/system/helpers/xml_helper.php old mode 100755 new mode 100644 diff --git a/system/index.html b/system/index.html old mode 100755 new mode 100644 diff --git a/system/language/english/calendar_lang.php b/system/language/english/calendar_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/date_lang.php b/system/language/english/date_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/db_lang.php b/system/language/english/db_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/email_lang.php b/system/language/english/email_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/form_validation_lang.php b/system/language/english/form_validation_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/ftp_lang.php b/system/language/english/ftp_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/imglib_lang.php b/system/language/english/imglib_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/index.html b/system/language/english/index.html old mode 100755 new mode 100644 diff --git a/system/language/english/number_lang.php b/system/language/english/number_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/profiler_lang.php b/system/language/english/profiler_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/unit_test_lang.php b/system/language/english/unit_test_lang.php old mode 100755 new mode 100644 diff --git a/system/language/english/upload_lang.php b/system/language/english/upload_lang.php old mode 100755 new mode 100644 diff --git a/system/language/index.html b/system/language/index.html old mode 100755 new mode 100644 diff --git a/system/libraries/Cache/Cache.php b/system/libraries/Cache/Cache.php old mode 100755 new mode 100644 diff --git a/system/libraries/Cache/drivers/Cache_apc.php b/system/libraries/Cache/drivers/Cache_apc.php old mode 100755 new mode 100644 diff --git a/system/libraries/Cache/drivers/Cache_dummy.php b/system/libraries/Cache/drivers/Cache_dummy.php old mode 100755 new mode 100644 diff --git a/system/libraries/Cache/drivers/Cache_file.php b/system/libraries/Cache/drivers/Cache_file.php old mode 100755 new mode 100644 diff --git a/system/libraries/Cache/drivers/Cache_memcached.php b/system/libraries/Cache/drivers/Cache_memcached.php old mode 100755 new mode 100644 diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php old mode 100755 new mode 100644 diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php old mode 100755 new mode 100644 diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php old mode 100755 new mode 100644 diff --git a/system/libraries/Email.php b/system/libraries/Email.php old mode 100755 new mode 100644 diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php old mode 100755 new mode 100644 diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php old mode 100755 new mode 100644 diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php old mode 100755 new mode 100644 diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php old mode 100755 new mode 100644 diff --git a/system/libraries/Javascript.php b/system/libraries/Javascript.php old mode 100755 new mode 100644 diff --git a/system/libraries/Log.php b/system/libraries/Log.php old mode 100755 new mode 100644 diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php old mode 100755 new mode 100644 diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php old mode 100755 new mode 100644 diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php old mode 100755 new mode 100644 diff --git a/system/libraries/Session.php b/system/libraries/Session.php old mode 100755 new mode 100644 diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php old mode 100755 new mode 100644 diff --git a/system/libraries/Table.php b/system/libraries/Table.php old mode 100755 new mode 100644 diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php old mode 100755 new mode 100644 diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php old mode 100755 new mode 100644 diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php old mode 100755 new mode 100644 diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php old mode 100755 new mode 100644 diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php old mode 100755 new mode 100644 diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php old mode 100755 new mode 100644 index d702e902..b2b3432d --- a/system/libraries/Xmlrpc.php +++ b/system/libraries/Xmlrpc.php @@ -548,30 +548,25 @@ function xmlrpc_decoder($xmlrpc_val) { $kind = $xmlrpc_val->kindOf(); - if ($kind == 'scalar') - { + if ($kind == 'scalar') { return $xmlrpc_val->scalarval(); - } - elseif ($kind == 'array') - { + } elseif ($kind == 'array') { reset($xmlrpc_val->me); - list($a,$b) = each($xmlrpc_val->me); - $size = count($b); - $arr = array(); - - for ($i = 0; $i < $size; $i++) - { - $arr[] = $this->xmlrpc_decoder($xmlrpc_val->me['array'][$i]); + foreach($xmlrpc_val->me as $a => $b){ + $size = count($b); + + + for ($i = 0; $i < $size; $i++) { + $arr[] = $this->xmlrpc_decoder($xmlrpc_val->me['array'][$i]); + } } return $arr; - } - elseif ($kind == 'struct') - { + } elseif ($kind == 'struct') { reset($xmlrpc_val->me['struct']); $arr = array(); - while (list($key,$value) = each($xmlrpc_val->me['struct'])) + foreach($xmlrpc_val->me['struct'] as $key => $value) { $arr[$key] = $this->xmlrpc_decoder($value); } @@ -1169,13 +1164,13 @@ function decode_message($param) elseif ($kind == 'array') { reset($param->me); - list($a,$b) = each($param->me); - $arr = array(); + foreach($param->me as $a => $b){ - for($i = 0; $i < count($b); $i++) - { - $arr[] = $this->decode_message($param->me['array'][$i]); + for($i = 0; $i < count($b); $i++) + { + $arr[] = $this->decode_message($param->me['array'][$i]); + } } return $arr; @@ -1186,7 +1181,7 @@ function decode_message($param) $arr = array(); - while (list($key,$value) = each($param->me['struct'])) + foreach($param->me['struct'] as $key => $value) { $arr[$key] = $this->decode_message($value); } @@ -1331,7 +1326,7 @@ function serializedata($typ, $val) // struct $rs .= "\n"; reset($val); - while (list($key2, $val2) = each($val)) + foreach($val as $key2 => $val2) { $rs .= "\n{$key2}\n"; $rs .= $this->serializeval($val2); @@ -1381,15 +1376,17 @@ function serializeval($o) $ar = $o->me; reset($ar); - list($typ, $val) = each($ar); - $rs = "\n".$this->serializedata($typ, $val)."\n"; + $typ = array_keys($ar); + $val = array_values($ar); + $rs = "\n".$this->serializedata($typ[0], $val[0])."\n"; return $rs; } function scalarval() { reset($this->me); - list($a,$b) = each($this->me); + $a = array_keys($this->me); + $b = array_values($this->me); return $b; } diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php old mode 100755 new mode 100644 index 9cd33214..fb4b81e3 --- a/system/libraries/Xmlrpcs.php +++ b/system/libraries/Xmlrpcs.php @@ -585,8 +585,10 @@ function do_multicall($call) return $this->multicall_error('notarray'); } - list($a,$b)=each($params->me); - $numParams = count($b); + //list($a,$b)=each($params->me); + $b = array_values($params->me); + + $numParams = count($b[0]); $msg = new XML_RPC_Message($scalar_value); for ($i = 0; $i < $numParams; $i++) diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php old mode 100755 new mode 100644 diff --git a/system/libraries/index.html b/system/libraries/index.html old mode 100755 new mode 100644 diff --git a/system/libraries/javascript/Jquery.php b/system/libraries/javascript/Jquery.php old mode 100755 new mode 100644 diff --git a/themes/_common/jquery-1.4.2.min.js b/themes/_common/jquery-1.4.2.min.js old mode 100644 new mode 100755 diff --git a/themes/_common/preview.jpg b/themes/_common/preview.jpg old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/LICENSE b/themes/_common/shadowbox/LICENSE old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/README b/themes/_common/shadowbox/README old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/close.png b/themes/_common/shadowbox/close.png old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/expressInstall.swf b/themes/_common/shadowbox/expressInstall.swf old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/loading.gif b/themes/_common/shadowbox/loading.gif old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/next.png b/themes/_common/shadowbox/next.png old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/pause.png b/themes/_common/shadowbox/pause.png old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/play.png b/themes/_common/shadowbox/play.png old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/player.swf b/themes/_common/shadowbox/player.swf old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/previous.png b/themes/_common/shadowbox/previous.png old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/shadowbox.css b/themes/_common/shadowbox/shadowbox.css old mode 100644 new mode 100755 diff --git a/themes/_common/shadowbox/shadowbox.js b/themes/_common/shadowbox/shadowbox.js old mode 100644 new mode 100755 diff --git a/themes/_plugins/block.module_installed.php b/themes/_plugins/block.module_installed.php old mode 100644 new mode 100755 diff --git a/themes/_plugins/block.restricted.php b/themes/_plugins/block.restricted.php old mode 100644 new mode 100755 diff --git a/themes/_plugins/function.money_format.php b/themes/_plugins/function.money_format.php old mode 100644 new mode 100755 diff --git a/themes/_plugins/function.paginate.php b/themes/_plugins/function.paginate.php old mode 100644 new mode 100755 diff --git a/themes/_plugins/function.setting.php b/themes/_plugins/function.setting.php old mode 100644 new mode 100755 diff --git a/themes/_plugins/function.shorten.php b/themes/_plugins/function.shorten.php old mode 100644 new mode 100755 diff --git a/themes/_plugins/function.theme_url.php b/themes/_plugins/function.theme_url.php old mode 100644 new mode 100755 diff --git a/themes/_plugins/function.thumbnail.php b/themes/_plugins/function.thumbnail.php old mode 100644 new mode 100755 diff --git a/themes/_plugins/function.url.php b/themes/_plugins/function.url.php old mode 100644 new mode 100755 diff --git a/themes/_plugins/function.xss_clean.php b/themes/_plugins/function.xss_clean.php old mode 100644 new mode 100755 diff --git a/themes/_plugins/modifier.parse_as_template.php b/themes/_plugins/modifier.parse_as_template.php old mode 100644 new mode 100755 diff --git a/themes/cubed/account_templates/cancel_subscription.thtml b/themes/cubed/account_templates/cancel_subscription.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/account_templates/change_password.thtml b/themes/cubed/account_templates/change_password.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/account_templates/forgot_password.thtml b/themes/cubed/account_templates/forgot_password.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/account_templates/forgot_password_complete.thtml b/themes/cubed/account_templates/forgot_password_complete.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/account_templates/home.thtml b/themes/cubed/account_templates/home.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/account_templates/invoice.thtml b/themes/cubed/account_templates/invoice.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/account_templates/invoices.thtml b/themes/cubed/account_templates/invoices.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/account_templates/login.thtml b/themes/cubed/account_templates/login.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/account_templates/profile.thtml b/themes/cubed/account_templates/profile.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/account_templates/registration.thtml b/themes/cubed/account_templates/registration.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/archives.thtml b/themes/cubed/archives.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/blog.thtml b/themes/cubed/blog.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/checkout_templates/account.thtml b/themes/cubed/checkout_templates/account.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/checkout_templates/billing_shipping.thtml b/themes/cubed/checkout_templates/billing_shipping.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/checkout_templates/checkout_layout.thtml b/themes/cubed/checkout_templates/checkout_layout.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/checkout_templates/complete.thtml b/themes/cubed/checkout_templates/complete.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/checkout_templates/free_confirm.thtml b/themes/cubed/checkout_templates/free_confirm.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/checkout_templates/payment.thtml b/themes/cubed/checkout_templates/payment.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/checkout_templates/register.thtml b/themes/cubed/checkout_templates/register.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/checkout_templates/shipping_method.thtml b/themes/cubed/checkout_templates/shipping_method.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/content.thtml b/themes/cubed/content.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/css/universal.css b/themes/cubed/css/universal.css old mode 100644 new mode 100755 diff --git a/themes/cubed/form.thtml b/themes/cubed/form.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/frontpage.thtml b/themes/cubed/frontpage.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/images/banner.jpg b/themes/cubed/images/banner.jpg old mode 100644 new mode 100755 diff --git a/themes/cubed/images/button.gif b/themes/cubed/images/button.gif old mode 100644 new mode 100755 diff --git a/themes/cubed/images/footer_corner.gif b/themes/cubed/images/footer_corner.gif old mode 100644 new mode 100755 diff --git a/themes/cubed/images/logo.jpg b/themes/cubed/images/logo.jpg old mode 100644 new mode 100755 diff --git a/themes/cubed/images/navbar_back.gif b/themes/cubed/images/navbar_back.gif old mode 100644 new mode 100755 diff --git a/themes/cubed/images/navbar_left.gif b/themes/cubed/images/navbar_left.gif old mode 100644 new mode 100755 diff --git a/themes/cubed/images/placeholders/apples.jpg b/themes/cubed/images/placeholders/apples.jpg old mode 100644 new mode 100755 diff --git a/themes/cubed/images/placeholders/blueberries.jpg b/themes/cubed/images/placeholders/blueberries.jpg old mode 100644 new mode 100755 diff --git a/themes/cubed/images/placeholders/cherries.jpg b/themes/cubed/images/placeholders/cherries.jpg old mode 100644 new mode 100755 diff --git a/themes/cubed/images/placeholders/oranges.jpg b/themes/cubed/images/placeholders/oranges.jpg old mode 100644 new mode 100755 diff --git a/themes/cubed/images/placeholders/pears.jpg b/themes/cubed/images/placeholders/pears.jpg old mode 100644 new mode 100755 diff --git a/themes/cubed/images/placeholders/strawberries.jpg b/themes/cubed/images/placeholders/strawberries.jpg old mode 100644 new mode 100755 diff --git a/themes/cubed/images/sideleft.gif b/themes/cubed/images/sideleft.gif old mode 100644 new mode 100755 diff --git a/themes/cubed/install.php b/themes/cubed/install.php old mode 100644 new mode 100755 diff --git a/themes/cubed/js/checkout.js b/themes/cubed/js/checkout.js old mode 100644 new mode 100755 diff --git a/themes/cubed/js/form.js b/themes/cubed/js/form.js old mode 100644 new mode 100755 diff --git a/themes/cubed/js/universal.js b/themes/cubed/js/universal.js old mode 100644 new mode 100755 diff --git a/themes/cubed/layout.thtml b/themes/cubed/layout.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/members_content.thtml b/themes/cubed/members_content.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/news_post.thtml b/themes/cubed/news_post.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/paywall.thtml b/themes/cubed/paywall.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/preview.jpg b/themes/cubed/preview.jpg old mode 100644 new mode 100755 diff --git a/themes/cubed/rss_feed.txml b/themes/cubed/rss_feed.txml old mode 100644 new mode 100755 diff --git a/themes/cubed/search.thtml b/themes/cubed/search.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/static_page.thtml b/themes/cubed/static_page.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/store_cart.thtml b/themes/cubed/store_cart.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/store_listing.thtml b/themes/cubed/store_listing.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/store_product.thtml b/themes/cubed/store_product.thtml old mode 100644 new mode 100755 diff --git a/themes/cubed/subscriptions.thtml b/themes/cubed/subscriptions.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/account_templates/cancel_subscription.thtml b/themes/electric/account_templates/cancel_subscription.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/account_templates/change_password.thtml b/themes/electric/account_templates/change_password.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/account_templates/forgot_password.thtml b/themes/electric/account_templates/forgot_password.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/account_templates/forgot_password_complete.thtml b/themes/electric/account_templates/forgot_password_complete.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/account_templates/home.thtml b/themes/electric/account_templates/home.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/account_templates/invoice.thtml b/themes/electric/account_templates/invoice.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/account_templates/invoices.thtml b/themes/electric/account_templates/invoices.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/account_templates/login.thtml b/themes/electric/account_templates/login.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/account_templates/profile.thtml b/themes/electric/account_templates/profile.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/account_templates/registration.thtml b/themes/electric/account_templates/registration.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/archives.thtml b/themes/electric/archives.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/blog_post.thtml b/themes/electric/blog_post.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/checkout_templates/account.thtml b/themes/electric/checkout_templates/account.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/checkout_templates/billing_shipping.thtml b/themes/electric/checkout_templates/billing_shipping.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/checkout_templates/checkout_layout.thtml b/themes/electric/checkout_templates/checkout_layout.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/checkout_templates/complete.thtml b/themes/electric/checkout_templates/complete.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/checkout_templates/free_confirm.thtml b/themes/electric/checkout_templates/free_confirm.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/checkout_templates/payment.thtml b/themes/electric/checkout_templates/payment.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/checkout_templates/register.thtml b/themes/electric/checkout_templates/register.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/checkout_templates/shipping_method.thtml b/themes/electric/checkout_templates/shipping_method.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/content.thtml b/themes/electric/content.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/css/universal.css b/themes/electric/css/universal.css old mode 100644 new mode 100755 diff --git a/themes/electric/event.thtml b/themes/electric/event.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/events.thtml b/themes/electric/events.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/form.thtml b/themes/electric/form.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/frontpage.thtml b/themes/electric/frontpage.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/images/body_back.jpg b/themes/electric/images/body_back.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/button.gif b/themes/electric/images/button.gif old mode 100644 new mode 100755 diff --git a/themes/electric/images/content_back.gif b/themes/electric/images/content_back.gif old mode 100644 new mode 100755 diff --git a/themes/electric/images/header_back.jpg b/themes/electric/images/header_back.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/logo.png b/themes/electric/images/logo.png old mode 100644 new mode 100755 diff --git a/themes/electric/images/nav_separator.png b/themes/electric/images/nav_separator.png old mode 100644 new mode 100755 diff --git a/themes/electric/images/navigation_back.jpg b/themes/electric/images/navigation_back.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/placeholders/apples.jpg b/themes/electric/images/placeholders/apples.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/placeholders/blueberries.jpg b/themes/electric/images/placeholders/blueberries.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/placeholders/blueberries2.jpg b/themes/electric/images/placeholders/blueberries2.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/placeholders/cleaning.png b/themes/electric/images/placeholders/cleaning.png old mode 100644 new mode 100755 diff --git a/themes/electric/images/placeholders/download.jpg b/themes/electric/images/placeholders/download.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/placeholders/hero.jpg b/themes/electric/images/placeholders/hero.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/placeholders/house.jpg b/themes/electric/images/placeholders/house.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/placeholders/newyears.jpg b/themes/electric/images/placeholders/newyears.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/placeholders/oranges.jpg b/themes/electric/images/placeholders/oranges.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/placeholders/strawberries.jpg b/themes/electric/images/placeholders/strawberries.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/images/post.gif b/themes/electric/images/post.gif old mode 100644 new mode 100755 diff --git a/themes/electric/images/sidebar_body.gif b/themes/electric/images/sidebar_body.gif old mode 100644 new mode 100755 diff --git a/themes/electric/images/sidebar_foot.gif b/themes/electric/images/sidebar_foot.gif old mode 100644 new mode 100755 diff --git a/themes/electric/images/sidebar_head.gif b/themes/electric/images/sidebar_head.gif old mode 100644 new mode 100755 diff --git a/themes/electric/images/wrapper_back.gif b/themes/electric/images/wrapper_back.gif old mode 100644 new mode 100755 diff --git a/themes/electric/install.php b/themes/electric/install.php old mode 100644 new mode 100755 diff --git a/themes/electric/js/checkout.js b/themes/electric/js/checkout.js old mode 100644 new mode 100755 diff --git a/themes/electric/js/form.js b/themes/electric/js/form.js old mode 100644 new mode 100755 diff --git a/themes/electric/js/universal.js b/themes/electric/js/universal.js old mode 100644 new mode 100755 diff --git a/themes/electric/layout.thtml b/themes/electric/layout.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/paywall.thtml b/themes/electric/paywall.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/preview.jpg b/themes/electric/preview.jpg old mode 100644 new mode 100755 diff --git a/themes/electric/rss_feed.txml b/themes/electric/rss_feed.txml old mode 100644 new mode 100755 diff --git a/themes/electric/search.thtml b/themes/electric/search.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/store_cart.thtml b/themes/electric/store_cart.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/store_listing.thtml b/themes/electric/store_listing.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/store_product.thtml b/themes/electric/store_product.thtml old mode 100644 new mode 100755 diff --git a/themes/electric/subscriptions.thtml b/themes/electric/subscriptions.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/account_templates/cancel_subscription.thtml b/themes/night_jungle/account_templates/cancel_subscription.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/account_templates/change_password.thtml b/themes/night_jungle/account_templates/change_password.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/account_templates/forgot_password.thtml b/themes/night_jungle/account_templates/forgot_password.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/account_templates/forgot_password_complete.thtml b/themes/night_jungle/account_templates/forgot_password_complete.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/account_templates/home.thtml b/themes/night_jungle/account_templates/home.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/account_templates/invoice.thtml b/themes/night_jungle/account_templates/invoice.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/account_templates/invoices.thtml b/themes/night_jungle/account_templates/invoices.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/account_templates/login.thtml b/themes/night_jungle/account_templates/login.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/account_templates/profile.thtml b/themes/night_jungle/account_templates/profile.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/account_templates/registration.thtml b/themes/night_jungle/account_templates/registration.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/archives.thtml b/themes/night_jungle/archives.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/blog.thtml b/themes/night_jungle/blog.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/checkout_templates/account.thtml b/themes/night_jungle/checkout_templates/account.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/checkout_templates/billing_shipping.thtml b/themes/night_jungle/checkout_templates/billing_shipping.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/checkout_templates/checkout_layout.thtml b/themes/night_jungle/checkout_templates/checkout_layout.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/checkout_templates/complete.thtml b/themes/night_jungle/checkout_templates/complete.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/checkout_templates/free_confirm.thtml b/themes/night_jungle/checkout_templates/free_confirm.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/checkout_templates/payment.thtml b/themes/night_jungle/checkout_templates/payment.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/checkout_templates/register.thtml b/themes/night_jungle/checkout_templates/register.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/checkout_templates/shipping_method.thtml b/themes/night_jungle/checkout_templates/shipping_method.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/content.thtml b/themes/night_jungle/content.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/css/universal.css b/themes/night_jungle/css/universal.css old mode 100644 new mode 100755 diff --git a/themes/night_jungle/form.thtml b/themes/night_jungle/form.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/frontpage.thtml b/themes/night_jungle/frontpage.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/back.jpg b/themes/night_jungle/images/back.jpg old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/button.gif b/themes/night_jungle/images/button.gif old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/logo.png b/themes/night_jungle/images/logo.png old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/placeholders/apples.jpg b/themes/night_jungle/images/placeholders/apples.jpg old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/placeholders/blueberries.jpg b/themes/night_jungle/images/placeholders/blueberries.jpg old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/placeholders/cherries.jpg b/themes/night_jungle/images/placeholders/cherries.jpg old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/placeholders/oranges.jpg b/themes/night_jungle/images/placeholders/oranges.jpg old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/placeholders/pears.jpg b/themes/night_jungle/images/placeholders/pears.jpg old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/placeholders/strawberries.jpg b/themes/night_jungle/images/placeholders/strawberries.jpg old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/post.png b/themes/night_jungle/images/post.png old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/tiger.jpg b/themes/night_jungle/images/tiger.jpg old mode 100644 new mode 100755 diff --git a/themes/night_jungle/images/translucent.png b/themes/night_jungle/images/translucent.png old mode 100644 new mode 100755 diff --git a/themes/night_jungle/install.php b/themes/night_jungle/install.php old mode 100644 new mode 100755 diff --git a/themes/night_jungle/js/checkout.js b/themes/night_jungle/js/checkout.js old mode 100644 new mode 100755 diff --git a/themes/night_jungle/js/form.js b/themes/night_jungle/js/form.js old mode 100644 new mode 100755 diff --git a/themes/night_jungle/js/universal.js b/themes/night_jungle/js/universal.js old mode 100644 new mode 100755 diff --git a/themes/night_jungle/layout.thtml b/themes/night_jungle/layout.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/members_content.thtml b/themes/night_jungle/members_content.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/paywall.thtml b/themes/night_jungle/paywall.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/preview.jpg b/themes/night_jungle/preview.jpg old mode 100644 new mode 100755 diff --git a/themes/night_jungle/rss_feed.txml b/themes/night_jungle/rss_feed.txml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/search.thtml b/themes/night_jungle/search.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/static_page.thtml b/themes/night_jungle/static_page.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/store_cart.thtml b/themes/night_jungle/store_cart.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/store_listing.thtml b/themes/night_jungle/store_listing.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/store_product.thtml b/themes/night_jungle/store_product.thtml old mode 100644 new mode 100755 diff --git a/themes/night_jungle/subscriptions.thtml b/themes/night_jungle/subscriptions.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/account_templates/cancel_subscription.thtml b/themes/orchard/account_templates/cancel_subscription.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/account_templates/change_password.thtml b/themes/orchard/account_templates/change_password.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/account_templates/forgot_password.thtml b/themes/orchard/account_templates/forgot_password.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/account_templates/forgot_password_complete.thtml b/themes/orchard/account_templates/forgot_password_complete.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/account_templates/home.thtml b/themes/orchard/account_templates/home.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/account_templates/invoice.thtml b/themes/orchard/account_templates/invoice.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/account_templates/invoices.thtml b/themes/orchard/account_templates/invoices.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/account_templates/login.thtml b/themes/orchard/account_templates/login.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/account_templates/profile.thtml b/themes/orchard/account_templates/profile.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/account_templates/registration.thtml b/themes/orchard/account_templates/registration.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/archives.thtml b/themes/orchard/archives.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/blog.thtml b/themes/orchard/blog.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/checkout_templates/account.thtml b/themes/orchard/checkout_templates/account.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/checkout_templates/billing_shipping.thtml b/themes/orchard/checkout_templates/billing_shipping.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/checkout_templates/checkout_layout.thtml b/themes/orchard/checkout_templates/checkout_layout.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/checkout_templates/complete.thtml b/themes/orchard/checkout_templates/complete.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/checkout_templates/free_confirm.thtml b/themes/orchard/checkout_templates/free_confirm.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/checkout_templates/payment.thtml b/themes/orchard/checkout_templates/payment.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/checkout_templates/register.thtml b/themes/orchard/checkout_templates/register.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/checkout_templates/shipping_method.thtml b/themes/orchard/checkout_templates/shipping_method.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/content.thtml b/themes/orchard/content.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/css/universal.css b/themes/orchard/css/universal.css old mode 100644 new mode 100755 diff --git a/themes/orchard/form.thtml b/themes/orchard/form.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/frontpage.thtml b/themes/orchard/frontpage.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/images/banner.jpg b/themes/orchard/images/banner.jpg old mode 100644 new mode 100755 diff --git a/themes/orchard/images/button.gif b/themes/orchard/images/button.gif old mode 100644 new mode 100755 diff --git a/themes/orchard/images/logo.jpg b/themes/orchard/images/logo.jpg old mode 100644 new mode 100755 diff --git a/themes/orchard/images/placeholders/apples.jpg b/themes/orchard/images/placeholders/apples.jpg old mode 100644 new mode 100755 diff --git a/themes/orchard/images/placeholders/blueberries.jpg b/themes/orchard/images/placeholders/blueberries.jpg old mode 100644 new mode 100755 diff --git a/themes/orchard/images/placeholders/cherries.jpg b/themes/orchard/images/placeholders/cherries.jpg old mode 100644 new mode 100755 diff --git a/themes/orchard/images/placeholders/oranges.jpg b/themes/orchard/images/placeholders/oranges.jpg old mode 100644 new mode 100755 diff --git a/themes/orchard/images/placeholders/pears.jpg b/themes/orchard/images/placeholders/pears.jpg old mode 100644 new mode 100755 diff --git a/themes/orchard/images/placeholders/strawberries.jpg b/themes/orchard/images/placeholders/strawberries.jpg old mode 100644 new mode 100755 diff --git a/themes/orchard/install.php b/themes/orchard/install.php old mode 100644 new mode 100755 diff --git a/themes/orchard/js/checkout.js b/themes/orchard/js/checkout.js old mode 100644 new mode 100755 diff --git a/themes/orchard/js/form.js b/themes/orchard/js/form.js old mode 100644 new mode 100755 diff --git a/themes/orchard/js/universal.js b/themes/orchard/js/universal.js old mode 100644 new mode 100755 diff --git a/themes/orchard/layout.thtml b/themes/orchard/layout.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/news_post.thtml b/themes/orchard/news_post.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/paywall.thtml b/themes/orchard/paywall.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/preview.jpg b/themes/orchard/preview.jpg old mode 100644 new mode 100755 diff --git a/themes/orchard/rss_feed.txml b/themes/orchard/rss_feed.txml old mode 100644 new mode 100755 diff --git a/themes/orchard/search.thtml b/themes/orchard/search.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/static_page.thtml b/themes/orchard/static_page.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/store_cart.thtml b/themes/orchard/store_cart.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/store_listing.thtml b/themes/orchard/store_listing.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/store_product.thtml b/themes/orchard/store_product.thtml old mode 100644 new mode 100755 diff --git a/themes/orchard/subscriptions.thtml b/themes/orchard/subscriptions.thtml old mode 100644 new mode 100755 diff --git a/writeable/email_templates/.htaccess b/writeable/email_templates/.htaccess new file mode 100755 index 00000000..a74a8eda --- /dev/null +++ b/writeable/email_templates/.htaccess @@ -0,0 +1,3 @@ + +Deny from all + \ No newline at end of file diff --git a/writeable/email_templates/email_layout.thtml b/writeable/email_templates/email_layout.thtml new file mode 100755 index 00000000..96610b33 --- /dev/null +++ b/writeable/email_templates/email_layout.thtml @@ -0,0 +1,18 @@ + + + + + + +
    + {block name="body"} + + {/block} + + {setting name="email_signature"} +
    + + \ No newline at end of file diff --git a/writeable/email_templates/index.html b/writeable/email_templates/index.html new file mode 100755 index 00000000..e69de29b diff --git a/writeable/email_templates/member_forgot_password_2_body.thtml b/writeable/email_templates/member_forgot_password_2_body.thtml new file mode 100755 index 00000000..317d8561 --- /dev/null +++ b/writeable/email_templates/member_forgot_password_2_body.thtml @@ -0,0 +1,13 @@ +{extends file="email_layout.thtml"} + +{block name="body"} +

    Hi {$member.first_name},

    + +

    You requested a new password at {$site_name}. Your new login information is below.

    + +

    Username: {$member.username}

    +

    Password: {$new_password}

    + +Click here to login now. + +{/block} \ No newline at end of file diff --git a/writeable/email_templates/member_forgot_password_2_subject.thtml b/writeable/email_templates/member_forgot_password_2_subject.thtml new file mode 100755 index 00000000..aff2a4f6 --- /dev/null +++ b/writeable/email_templates/member_forgot_password_2_subject.thtml @@ -0,0 +1 @@ +Your new password \ No newline at end of file diff --git a/writeable/email_templates/member_register_1_body.thtml b/writeable/email_templates/member_register_1_body.thtml new file mode 100755 index 00000000..32483f9b --- /dev/null +++ b/writeable/email_templates/member_register_1_body.thtml @@ -0,0 +1,13 @@ +{extends file="email_layout.thtml"} + +{block name="body"} +

    Hi {$member.first_name},

    + +

    Thank you for registering an account at {$site_name}. Your account details are below:

    + +

    Username: {$member.username}

    +

    Password: {$password}

    + +Click here to login now. + +{/block} \ No newline at end of file diff --git a/writeable/email_templates/member_register_1_subject.thtml b/writeable/email_templates/member_register_1_subject.thtml new file mode 100755 index 00000000..8123a1e1 --- /dev/null +++ b/writeable/email_templates/member_register_1_subject.thtml @@ -0,0 +1 @@ +{$site_name}: Account Details \ No newline at end of file diff --git a/writeable/email_templates/member_validate_email_3_body.thtml b/writeable/email_templates/member_validate_email_3_body.thtml new file mode 100755 index 00000000..5dca42fa --- /dev/null +++ b/writeable/email_templates/member_validate_email_3_body.thtml @@ -0,0 +1,12 @@ +{extends file="email_layout.thtml"} + +{block name="body"} +

    Hi {$member.first_name},

    + +

    Before your account is fully activated, you must validate your email address. You only have to do this once so that we know that we have your proper email address linked to your account.

    + +

    To validate your email and activate your account, please go to:

    + +{$validation_link} + +{/block} \ No newline at end of file diff --git a/writeable/email_templates/member_validate_email_3_subject.thtml b/writeable/email_templates/member_validate_email_3_subject.thtml new file mode 100755 index 00000000..e4078c64 --- /dev/null +++ b/writeable/email_templates/member_validate_email_3_subject.thtml @@ -0,0 +1 @@ +Please validate your email \ No newline at end of file