diff --git a/private/common/config.php b/private/common/config.php index dcb534d..815d55b 100644 --- a/private/common/config.php +++ b/private/common/config.php @@ -77,6 +77,7 @@ $config->emails->newsletter = "newsletter@ifattidinapoli.it"; $config->emails->techSupport = "tecnicalSupport@ifattidinapoli.it"; $config->emails->info = "info@ifattidinapoli.it"; $config->emails->system = "system@ifattidinapoli.it"; +$config->emails->postmaster = "postmaster@ifattidinapoli.it"; // $config->pages->index = $currentSystem->remoteLocation . "/index.php"; diff --git a/private/lib/FDN_MailHelper.php b/private/lib/FDN_MailHelper.php new file mode 100644 index 0000000..1f21e5c --- /dev/null +++ b/private/lib/FDN_MailHelper.php @@ -0,0 +1,27 @@ +from = $config->emails->postmaster; + $tmp->recipient = $admin->email; + $tmp->subject = "Attivazione account I Fatti di Napoli"; + + $confirmLink = GUIHandler::getBaseUrl()."admin/confirmAdmin.php?regcode=".$admin->id."&email=".$admin->email; + + $tmp->body = "Per attivare il tuo account clicka sul link riportato in seguito o copialo e incollalo nel tuo browser.

"; + $tmp->body.=''.$confirmLink.''; + + return new MailModel($tmp); + } + +} + +?> \ No newline at end of file diff --git a/private/lib/MultimessageException.php b/private/lib/MultimessageException.php new file mode 100644 index 0000000..6961f06 --- /dev/null +++ b/private/lib/MultimessageException.php @@ -0,0 +1,29 @@ +messageList = $arr; + $this->message = $this->getMessageMerged("\n"); + } + + public function addMessage($msg){ + $this->messageList[]=$msg; + $this->message = $this->getMessageMerged("\n"); + } + + public function getMessageList(){ + return $this->messageList; + } + + public function getMessageMerged($glue){ + return implode($glue,$this->getMessageList()); + } +} + +?> \ No newline at end of file diff --git a/private/lib/dao/lib.inclusion.php b/private/lib/dao/lib.inclusion.php index ea3f0d5..c229a18 100644 --- a/private/lib/dao/lib.inclusion.php +++ b/private/lib/dao/lib.inclusion.php @@ -27,6 +27,8 @@ require_once(dirname(__FILE__)."/models/UserModel.php"); require_once(dirname(__FILE__)."/models/MailModel.php"); require_once(dirname(__FILE__)."/models/MailTemplateModel.php"); +require_once(dirname(__FILE__)."/models/AccessModel.php"); + $dao = new GenericDao($database->dbName,$database->connectionString); GlobalVariables::set("dao", $dao); ?> \ No newline at end of file diff --git a/private/lib/dao/models/AccessModel.php b/private/lib/dao/models/AccessModel.php new file mode 100644 index 0000000..b240a5e --- /dev/null +++ b/private/lib/dao/models/AccessModel.php @@ -0,0 +1,32 @@ +hasProperty("date")){ + $this->date = new MongoDate(); + } + + foreach ($requiredProps as $prop){ + if (!$this->hasProperty($prop)){ + throw new CoreException("Missing parameter '$prop' while calling AdminAccessModel::__construct()"); + } + } + } + + public static function getCollectionName(){ + return "accessLog"; + } + +} + +?> \ No newline at end of file diff --git a/private/lib/gui/DatatablesHelper.php b/private/lib/gui/DatatablesHelper.php index d17ca05..544a7a4 100644 --- a/private/lib/gui/DatatablesHelper.php +++ b/private/lib/gui/DatatablesHelper.php @@ -117,7 +117,7 @@ class DatatablesHelper { \ No newline at end of file diff --git a/public/admin/confirmNewsletter.php b/public/admin/confirmNewsletter.php index 75e5354..40ef34f 100644 --- a/public/admin/confirmNewsletter.php +++ b/public/admin/confirmNewsletter.php @@ -56,9 +56,13 @@ try { echo '
'.$error.'
'; } ?> - Conferma - Annulla -
subject; ?>
+
+ Conferma + Annulla +
+
Oggettosubject; ?>
+
Giornodate->sec); ?>
+
Oradate->sec); ?>

body; ?>
diff --git a/public/admin/editAmministratori.php b/public/admin/editAmministratori.php index 7c6ce0f..1a255c0 100644 --- a/public/admin/editAmministratori.php +++ b/public/admin/editAmministratori.php @@ -24,6 +24,7 @@ $giornalista = new AdminModel(); $giornalista->nome = ""; $giornalista->cognome = ""; $giornalista->email = ""; +$giornalista->username = ""; $giornalista->active = false; $giornalista->activationSent = false; @@ -43,6 +44,11 @@ if (!is_null($action) && strcmp("", $action)!=0){ $giornalista->nome = PostHandler::get("nome"); $giornalista->cognome = PostHandler::get("cognome"); $giornalista->email = PostHandler::get("email"); + + $giornalista->username = PostHandler::get("username"); + + $giornalista->active = !is_null(PostHandler::get("active")) && strcmp(PostHandler::get("active"), "active")==0; + foreach (AdminModel::$ADMIN_TYPES as $maskVal=>$data){ if ($data["typeFlags"]!=AdminModel::TYPE_FLAG_HIDDEN){ $cur = PostHandler::get($maskVal); @@ -64,20 +70,39 @@ if (!is_null($action) && strcmp("", $action)!=0){
- Nome - Cognome - Email -
+
+ Nome + +
+
+ Cognome + +
+
+ Email + +
+
+ Username + +
+
+ Attivo + active?'checked="checked"':""; ?>/> +
+
 Ruoli
$data){ if ($data["typeFlags"]!=AdminModel::TYPE_FLAG_HIDDEN){ - echo 'hasRole($maskVal)?'checked="checked"':"").' />'.$data["label"]."
"; + echo '
'.$data["label"].'hasRole($maskVal)?'checked="checked"':"").' />
'; } } ?>
- Salva - Annulla +
+ Salva + Annulla +