Thread: [Isocial-svn] SF.net SVN: isocial: [27] app/application_controller.php
Status: Pre-Alpha
Brought to you by:
aguidrevitch
From: <agu...@us...> - 2008-02-25 18:13:12
|
Revision: 27 http://isocial.svn.sourceforge.net/isocial/?rev=27&view=rev Author: aguidrevitch Date: 2008-02-25 10:13:14 -0800 (Mon, 25 Feb 2008) Log Message: ----------- 'from' and 'subject' email fields are correctly encoded as utf8 Modified Paths: -------------- app/application_controller.php Modified: app/application_controller.php =================================================================== --- app/application_controller.php 2008-02-25 18:10:24 UTC (rev 26) +++ app/application_controller.php 2008-02-25 18:13:14 UTC (rev 27) @@ -97,12 +97,9 @@ function sendHTMLemail( $to, $html, $enable_text = false) { list($header, $html) = preg_split('/\r?\n\r?\n/m', $html, 2); $headers = $this->extractHeaders( $header ); - - if (preg_match('/(\"[^\"]+\")/', $headers['From'], $matches)) { - $name = "=?utf-8?B?" . base64_encode($matches[0]) . "?="; - $headers['From'] = preg_replace('/\"[^\"]+\"/', $name, $headers['From']); - } + $headers['From'] = $this->_fix_email($headers['From']); + $body = "From: " . $headers['From'] . "\n"; $body .= "MIME-Version: 1.0\n"; $boundary = uniqid("HTMLEMAIL"); @@ -123,8 +120,8 @@ "Content-Type: text/html; charset=utf-8\n". "Content-Transfer-Encoding: base64\n\n"; $body .= chunk_split(base64_encode($html)); - - mail($to, $headers['Subject'], "", $body); + + mail($to, $this->_to_base64_utf8($headers['Subject']), "", $body); } function extractHeaders ( $header ) { @@ -150,7 +147,19 @@ { return $this->renderPartial("pageheader"); } + + function _fix_email ($value) { + // eats last space !!! + if (preg_match('/(.*?)\s+(<?\S+@\S+>?)/', $value, $matches)) { + $name = $this->_to_base64_utf8($matches[1]); + $value = $name . " " . $matches[2]; + } + return $value; + } + function _to_base64_utf8 ($value) { + return "=?utf-8?B?" . base64_encode($value) . "?="; + } } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-03-17 20:05:45
|
Revision: 92 http://isocial.svn.sourceforge.net/isocial/?rev=92&view=rev Author: aguidrevitch Date: 2008-03-17 13:05:51 -0700 (Mon, 17 Mar 2008) Log Message: ----------- only active users can be logged in Modified Paths: -------------- app/application_controller.php Modified: app/application_controller.php =================================================================== --- app/application_controller.php 2008-03-17 20:01:58 UTC (rev 91) +++ app/application_controller.php 2008-03-17 20:05:51 UTC (rev 92) @@ -48,8 +48,10 @@ if (isset($this->session['user_id'])) { $user_id = $this->session['user_id']; if ( $user_id && $user = $this->User->find($user_id)) { - $this->current_user = $user; - return $this->current_user; + if ($user && $user->active) { + $this->current_user = $user; + return $this->current_user; + } } } return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-06-01 17:32:10
|
Revision: 233 http://isocial.svn.sourceforge.net/isocial/?rev=233&view=rev Author: aguidrevitch Date: 2008-06-01 10:32:12 -0700 (Sun, 01 Jun 2008) Log Message: ----------- improved shared file handling Modified Paths: -------------- app/application_controller.php Modified: app/application_controller.php =================================================================== --- app/application_controller.php 2008-06-01 17:05:00 UTC (rev 232) +++ app/application_controller.php 2008-06-01 17:32:12 UTC (rev 233) @@ -58,11 +58,13 @@ if (is_array($key_or_value)) { foreach ($key_or_value as $key => $value) { if ($stored = $this->_processSingleFile($key_or_value[$key])) { + $this->params[$fieldname][$key] = $stored; array_push($this->uploaded_files, $stored); } } } else { if ($stored = $this->_processSingleFile($uploaded[$fieldname])) { + $this->params[$fieldname] = $stored; array_push($this->uploaded_files, $stored); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <agu...@us...> - 2008-03-19 19:18:20
|
Revision: 99 http://isocial.svn.sourceforge.net/isocial/?rev=99&view=rev Author: aguidrevitch Date: 2008-03-19 12:18:26 -0700 (Wed, 19 Mar 2008) Log Message: ----------- fix for new country / city db schema Modified Paths: -------------- app/application_controller.php Modified: app/application_controller.php =================================================================== --- app/application_controller.php 2008-03-19 19:17:40 UTC (rev 98) +++ app/application_controller.php 2008-03-19 19:18:26 UTC (rev 99) @@ -194,11 +194,11 @@ $aquery = utf8_to_ascii($query); if ($aquery != $query) { $conditions = array( - 'first_id IS NOT NULL AND name LIKE ? OR name LIKE ?', $query . '%', $aquery . '%' + 'name LIKE ? OR name LIKE ?', $query . '%', $aquery . '%' ); } else { $conditions = array( - 'first_id IS NOT NULL AND name LIKE ?', $query . '%' + 'name LIKE ?', $query . '%' ); } @@ -207,14 +207,14 @@ 'conditions' => $conditions, 'include' => 'country', 'limit' => 10, - 'order' => 'is_native DESC, name' + 'order' => 'name' ) ); - if (!empty($entries)) { + if (!empty($entries)) { $this->renderText( $this->city_helper->auto_complete_result($entries, $query, $this->params['city']) ); - } else { - $this->renderNothing(); - } + } else { + $this->renderNothing(); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |