diff --git a/app/private/common/config.php b/app/private/common/config.php index 78d701a..ac9c40c 100644 --- a/app/private/common/config.php +++ b/app/private/common/config.php @@ -132,4 +132,11 @@ $config->cbs2->serverPort = $cbs2->serverPort; $config->database = $database; +$config->mailer = new stdClass(); +$config->mailer->address = "email-smtp.eu-west-1.amazonaws.com"; +$config->mailer->port = "25"; +$config->mailer->username = "AKIASMB7IW2MQPUP5CXS"; +$config->mailer->password = "BHv+82Nns1kIKg99Hx0sjKlEpR+X4+1EgX+ec64n/mBt"; +$config->mailer->smtpAuth = true; + ?> diff --git a/app/private/lib/dao/models/MailModel.php b/app/private/lib/dao/models/MailModel.php index 1470e76..e8d41ac 100644 --- a/app/private/lib/dao/models/MailModel.php +++ b/app/private/lib/dao/models/MailModel.php @@ -42,36 +42,48 @@ class MailModel extends Model implements FDN_MailInterface{ return parent::__set($attr, $value); } - public function getMailObject(){ - $email = new PHPMailer(); - $email->CharSet = "UTF-8"; - $email->isMail(); - - $email->From = $this->from; + + public function getMailObject() { + $email = new PHPMailer(); + $email->CharSet = "UTF-8"; + $email->isMail(); + + $email->From = $this->from; if ($this->hasProperty("fromName")){ $email->FromName = $this->fromName; } - - $email->Subject = $this->subject; + + $email->Subject = $this->subject; $email->IsHTML(true); - - $email->Body = $this->body; + + + $email->Body = $this->body; if ($this->hasProperty("altBody")){ $email->AltBody = $this->altBody; } else { $email->AltBody = strip_tags($this->body); } - - $email->AddAddress($this->recipient); + + + $email->AddAddress($this->recipient); if ($this->hasProperty("attachment")){ $email->AddAttachment( $this->attachment , basename($this->attachment) ); } - - return $email; - } + + $cfg = GlobalVariables::get("config"); + + $email->IsSMTP(); + $email->Host = $cfg->mailer->address; + $email->Port = $cfg->mailer->port; + $email->Username = $cfg->mailer->username; + $email->Password = $cfg->mailer->password; + $email->SMTPAuth = $cfg->mailer->smtpAuth; + + return $email; + } public static function getCollectionName(){ return "mail"; diff --git a/app/private/lib/gui/MenuGenerator.php b/app/private/lib/gui/MenuGenerator.php index b48d7b3..1b9b6df 100644 --- a/app/private/lib/gui/MenuGenerator.php +++ b/app/private/lib/gui/MenuGenerator.php @@ -28,9 +28,9 @@ class MenuGenerator { array("label"=>"Utenti registrati","page"=>"listUsers.php","requires"=>AdminModel::ADMIN_TYPE_NORMALADMIN), array("label"=>"Newsletter", "subvoices"=>array( - array("label"=>"Nuova","page"=>"editNewsletter.php","requires"=>AdminModel::ADMIN_TYPE_NEWSLETTER), - array("label"=>"Da inviare","page"=>"pendingNewsletters.php","requires"=>AdminModel::ADMIN_TYPE_NEWSLETTER), - array("label"=>"Inviate","page"=>"sentNewsletters.php","requires"=>AdminModel::ADMIN_TYPE_NEWSLETTER), + // array("label"=>"Nuova","page"=>"editNewsletter.php","requires"=>AdminModel::ADMIN_TYPE_NEWSLETTER), + // array("label"=>"Da inviare","page"=>"pendingNewsletters.php","requires"=>AdminModel::ADMIN_TYPE_NEWSLETTER), + // array("label"=>"Inviate","page"=>"sentNewsletters.php","requires"=>AdminModel::ADMIN_TYPE_NEWSLETTER), array("label"=>"Nuova Mail","page"=>"editMail.php","requires"=>AdminModel::ADMIN_TYPE_SUPERADMIN), array("label"=>"Coda Mail","page"=>"listMail.php","requires"=>AdminModel::ADMIN_TYPE_SUPERADMIN) )), diff --git a/app/public/admin/index.php b/app/public/admin/index.php index ba86e9f..aa4304c 100644 --- a/app/public/admin/index.php +++ b/app/public/admin/index.php @@ -74,7 +74,7 @@ HTMLHelper::generateAdminHead();
  • Banner testata:180x60px
  • Banner corpo:160x120px
  • Banner lungo:160x240px
  • -
  • Banner Inizio pagina:1000x120px
  • +
  • Banner Inizio pagina:1000x150px
  • Banner Fine pagina:1000x200px
  • Tale restizione è consigliata anche per i banner di tipo HTML5. diff --git a/app/public/style/public.css b/app/public/style/public.css index abfa873..5142404 100644 --- a/app/public/style/public.css +++ b/app/public/style/public.css @@ -28,7 +28,7 @@ body{font-family:lato, arial;} .rightBanner{position:absolute;top:45px;right:10px;} .topBanner{width:180px;height:60px;} .topBanner > * { max-width:100%; max-height:100%; } -.subheadBanner { width:1000px; height:120px; } +.subheadBanner { width:1000px; height:150px; } .footerBanner { width:1000px; height:200px; }