gmm42

--- vimbadmin-orig/application/controllers/MailboxController.php        2012-05-24 13:07:44.000000000 +0200
+++ vimbadmin/application/controllers/MailboxController.php     2012-10-07 18:02:14.696725816 +0200
@@ -564,7 +564,7 @@

     private function _sendSettingsEmail( $cc = false, $password = '', $isWelcome = false )
     {
-        $mailer = new Zend_Mail();
+        $mailer = new Zend_Mail('UTF-8');

         if( $isWelcome )

gmm42

Dragi Oglasnik administratore,
\n

primili ste ovaj e-mail jer je na Oglasnik stranici napravljen novi korisnik.
\n

Detalji o korisniku:
\n

Ime: Mirko

gmm42

--- oc-includes/osclass/utils.php.orig  2012-05-16 20:49:45.103870848 +0200
+++ oc-includes/osclass/utils.php       2012-05-16 21:42:17.031870791 +0200
@@ -305,7 +305,7 @@
         $mail->FromName = ( isset($params['from_name']) ) ? $params['from_name'] : osc_page_title() ;
         $mail->Subject = ( isset($params['subject']) ) ? $params['subject'] : '' ;
         $mail->Body = ( isset($params['body']) ) ? $params['body'] : '' ;
-        $mail->AltBody = ( isset($params['alt_body']) ) ? $params['alt_body'] : '' ;
+        $mail->AltBody = ( isset($params['alt_body']) ) ? strip_tags(preg_replace('#</p>|<br\s*/?>#i', "\n", $params['alt_body'])) : '' ;
         $to = ( isset($params['to']) ) ? $params['to'] : '' ;
         $to_name = ( isset($params['to_name']) ) ? $params['to_name'] : '' ;

gmm42

--- oc-includes/osclass/utils.php.orig  2012-04-28 17:09:43.124215432 +0200
+++ oc-includes/osclass/utils.php       2012-04-28 18:08:36.174587316 +0200
@@ -304,8 +304,8 @@
         $mail->From = ( isset($params['from']) ) ? $params['from'] : osc_contact_email() ;
         $mail->FromName = ( isset($params['from_name']) ) ? $params['from_name'] : osc_page_title() ;
         $mail->Subject = ( isset($params['subject']) ) ? $params['subject'] : '' ;
-        $mail->Body = ( isset($params['body']) ) ? $params['body'] : '' ;
-        $mail->AltBody = ( isset($params['alt_body']) ) ? $params['alt_body'] : '' ;
+        $mail->Body = ( isset($params['body']) ) ? str_replace('\n', "\n", $params['body']) : '' ;
+        $mail->AltBody = ( isset($params['alt_body']) ) ? str_replace('\n', "\n\n", strip_tags(preg_replace('#<br\s*/?>#i', "\n", $params['alt_body']))) : '' ;

gmm42

--- oc-content/themes/modern/header.php.orig    2012-04-25 09:35:40.659719953 +0200
+++ oc-content/themes/modern/header.php 2012-04-25 09:36:30.191744119 +0200
@@ -46,9 +46,9 @@
                             <fieldset>
                                 <input type="hidden" name="page" value="login" />
                                 <input type="hidden" name="action" value="login_post" />
-                                <label for="email"><?php _e('E-mail', 'modern') ; ?></label>
-                                <?php UserForm::email_login_text() ; ?>
-                                <label for="password"><?php _e('Password', 'modern') ; ?></label>
+                                <label for="email"><?php _e('E-mail', 'modern') ; ?></label><br />

gmm42

diff --git a/oc-includes/osclass/feeds.php b/oc-includes/osclass/feeds.php
index 90cacf9..d48a080 100755
--- a/oc-includes/osclass/feeds.php
+++ b/oc-includes/osclass/feeds.php
@@ -32,7 +32,7 @@ function osc_listNews() {
     } else {
         $list = array();

-        $content = osc_file_get_contents('http://osclass.org/feed/');
+        $content = osc_file_get_contents('http://osclass.org/blog/feed/');