\#44: Umbenannt

ajax.php

@@ -7,7 +7,7 @@ require('includes/database.inc.php');
 require('includes/functions.inc.php');
 require('includes/document.inc.php');
 require('includes/label.inc.php');
-require('includes/imap.inc.php');
+require('includes/mailbox.inc.php');
 require('includes/mailboxfolder.inc.php');
 require('includes/documenthandler.inc.php');
 
@@ -92,7 +92,7 @@ switch($_REQUEST['action']) {
                 array(
                     "type"  => "select",
                     "name"  => "account",
-                    "value" => Imap::getMailboxNameFromMailaccountId($_GET['mbId'])
+                    "value" => Mailbox::getMailboxNameFromMailaccountId($_GET['mbId'])
                 ),
                 array(
                     "type"  => "text",
@@ -108,7 +108,7 @@ switch($_REQUEST['action']) {
         break;
     case 'getMailAccountsByUid':
         header("Status: 200 OK");
-        $mailboxes = Imap::getMailboxesByUserId($_REQUEST['uId'], false);
+        $mailboxes = Mailbox::getMailboxesByUserId($_REQUEST['uId'], false);
         $mbArray = array();
         foreach($mailboxes as $mailbox) {
             $mbArray[$mailbox->getId()] = $mailbox->getUsername();

cron.php

@@ -7,7 +7,7 @@ include('includes/database.inc.php');
 include('includes/functions.inc.php');
 include('includes/document.inc.php');
 include('includes/label.inc.php');
-include('includes/imap.inc.php');
+include('includes/mailbox.inc.php');
 include('includes/mailboxfolder.inc.php');
 
 $db = new Database($CONFIG['dbHost'], $CONFIG['dbUser'], $CONFIG['dbPassword'], $CONFIG['dbDatabase']);

includes/functions.inc.php

@@ -42,10 +42,7 @@ function searchNewFiles($scanDir) {
 
 function searchMails() {
 	global $user;
-	//$imap = new Imap('{mail.mmnx.de:993/imap/ssl/novalidate-cert}', 'mobi@mmnx.de', 'msmoro');
-	//$imap->listFolders();
-	$mailboxes = Imap::getMailBoxes();
-	//pa($mailboxes);
+	$mailboxes = Mailbox::getMailBoxes();
 
 	foreach($mailboxes as $mailbox) {
 		$mailbox->listFolders();

includes/imap.inc.php → includes/mailbox.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-class Imap {
+class Mailbox {
     private $id             = NULL;
     private $server         = NULL;
     private $hostname       = NULL;
@@ -112,7 +112,7 @@ class Imap {
             if(!$mailbox->valid_ssl) {
                 $noValidCert = '/novalidate-cert';
             }
-            $return[] = new Imap($mailbox->id, $mailbox->server, $mailbox->port, $mailbox->protocol, $useSsl, $noValidCert, $mailbox->username, $mailbox->password, $connect); // TODO: Encrypt password
+            $return[] = new Mailbox($mailbox->id, $mailbox->server, $mailbox->port, $mailbox->protocol, $useSsl, $noValidCert, $mailbox->username, $mailbox->password, $connect); // TODO: Encrypt password
         }
 
         return $return;
@@ -146,7 +146,7 @@ class Imap {
             if(!$mailbox->valid_ssl) {
                 $noValidCert = '/novalidate-cert';
             }
-            $return[] = new Imap($mailbox->id, $mailbox->server, $mailbox->port, $mailbox->protocol, $useSsl, $noValidCert, $mailbox->username, $mailbox->password, $connect); // TODO: Encrypt password
+            $return[] = new Mailbox($mailbox->id, $mailbox->server, $mailbox->port, $mailbox->protocol, $useSsl, $noValidCert, $mailbox->username, $mailbox->password, $connect); // TODO: Encrypt password
         }
 
         return $return;

index.php

@@ -10,7 +10,7 @@ include('includes/view.inc.php');
 include('includes/functions.inc.php');
 include('includes/label.inc.php');
 include('includes/document.inc.php');
-include('includes/imap.inc.php');
+include('includes/mailbox.inc.php');
 include('includes/mailboxfolder.inc.php');
 
 $db = new Database($CONFIG['dbHost'], $CONFIG['dbUser'], $CONFIG['dbPassword'], $CONFIG['dbDatabase']);

templates/manage-label.php

@@ -23,7 +23,7 @@
                             foreach($this->_['mailboxFolders'] as $mailboxFolder) {
                                 echo '<tr>';
                                 echo '<td>' . $mailboxFolder->getId() . '</td>';
-                                echo '<td>' . Imap::getMailboxNameFromMailaccountId($mailboxFolder->getMailboxId()) . '</td>';
+                                echo '<td>' . Mailbox::getMailboxNameFromMailaccountId($mailboxFolder->getMailboxId()) . '</td>';
                                 echo '<td>' . $mailboxFolder->getFolderName() . '</td>';
                                 echo '<td><a class="manage-mailboxfolder fancybox.ajax" data-uid="' . $this->_['user']->getUserId() . '" href="ajax.php?action=manageMailboxFolder&mfId=' . $mailboxFolder->getId() . '&mbId=' . $mailboxFolder->getMailboxId() . '" data-id="' . $mailboxFolder->getId() . '"><i class="fa fa-wrench"></i></a></td>';
                                 echo '<td><a class="remove-mailboxfolder" href="#" data-id="' . $mailboxFolder->getId() . '"><i class="fa fa-minus-circle"></i></a></td>';

templates/settings.php

@@ -5,7 +5,7 @@
         <h3>Mailaccounts</h3>
         <?php
             $user = $this->_['user'];
-            $mailboxes = Imap::getMailboxesByUserId($user->getUserId()); // TODO: MVC
+            $mailboxes = Mailbox::getMailboxesByUserId($user->getUserId()); // TODO: MVC
         ?>
 
         <table class="table table-striped">