Fixed #64

ajax.php

@@ -96,17 +96,17 @@ switch($_REQUEST['action']) {
                 array(
                     "type"      => "select",
                     "name"      => "account",
-                    "value"     => Mailbox::getMailboxNameFromMailaccountId($_GET['mbId']),
+                    "value"     => Mailbox::getMailboxNameFromMailaccountID($_GET['mbID']),
                     "values"    => array()
                 ),
                 array(
                     "type"  => "text",
                     "name"  => "folder",
-                    "value" => MailboxFolder::getMailboxFolderNameFromId($_GET['mfId'])
+                    "value" => MailboxFolder::getMailboxFolderNameFromID($_GET['mfID'])
                 )
             ),
             "title"     => "Mailkonto bearbeiten",
-            "mailboxFolderID"   => $_GET['mfId']
+            "mailboxFolderID"   => $_GET['mfID']
         );
 
         foreach($allMailBoxes as $mailBox) {
@@ -118,10 +118,10 @@ switch($_REQUEST['action']) {
         break;
     case 'getMailAccountsByUid':
         header("Status: 200 OK");
-        $mailboxes = Mailbox::getMailboxesByUserId($_REQUEST['uId']);
+        $mailboxes = Mailbox::getMailboxesByUserID($_REQUEST['uID']);
         $mbArray = array();
         foreach($mailboxes as $mailbox) {
-            $mbArray[$mailbox->getId()] = $mailbox->getUsername();
+            $mbArray[$mailbox->getID()] = $mailbox->getUsername();
         }
         echo json_encode($mbArray);
         break;
@@ -155,7 +155,7 @@ switch($_REQUEST['action']) {
         break;
     case 'getMailboxStatus':
         header("Status: 200 OK");
-        $mailbox = Mailbox::getMailboxById($_REQUEST['mailboxId'], true);
+        $mailbox = Mailbox::getMailboxByID($_REQUEST['mailboxID'], true);
         $mailboxStatus = array(
             "connected" => $mailbox->getConnected()
         );
@@ -164,7 +164,7 @@ switch($_REQUEST['action']) {
     case 'saveNewDocument':
         header("Status: 200 OK");
 
-        $newDocument = new DocumentHandler(Label::getLabelById($_REQUEST['labelId'])->getPath() . '/' . $_REQUEST['filename'], $_REQUEST['draft']);
+        $newDocument = new DocumentHandler(Label::getLabelByID($_REQUEST['labelID'])->getPath() . '/' . $_REQUEST['filename'], $_REQUEST['draft']);
 
         foreach($_REQUEST['draftVars'] as $key => $draftVar) {
             $newDocument->setVal($key, htmlspecialchars($draftVar));
@@ -208,7 +208,7 @@ switch($_REQUEST['action']) {
         break;
     case 'removeLabel':
         header("Status: 200 OK");
-        Label::removeLabel($_REQUEST['labelId']);
+        Label::removeLabel($_REQUEST['labelID']);
 
         $return = array(
             "status"    => "OK"
@@ -218,7 +218,7 @@ switch($_REQUEST['action']) {
         break;
     case 'saveMailFolder':
         header("Status: 200 OK");
-        MailboxFolder::updateMailboxFolder($_REQUEST['mailboxFolderID'], $_REQUEST['folder'], Mailbox::getMailboxByUsername($_REQUEST['account'])->getId(), $_REQUEST['labelID']);
+        MailboxFolder::updateMailboxFolder($_REQUEST['mailboxFolderID'], $_REQUEST['folder'], Mailbox::getMailboxByUsername($_REQUEST['account'])->getID(), $_REQUEST['labelID']);
 
         $return = array(
             "status"    => "OK"
@@ -228,7 +228,7 @@ switch($_REQUEST['action']) {
         break;
     case 'saveNewMailFolder':
         header("Status: 200 OK");
-        MailboxFolder::addMailboxFolder($_REQUEST['folder'], Mailbox::getMailboxByUsername($_REQUEST['account'])->getId(), $_REQUEST['labelID']);
+        MailboxFolder::addMailboxFolder($_REQUEST['folder'], Mailbox::getMailboxByUsername($_REQUEST['account'])->getID(), $_REQUEST['labelID']);
 
         $return = array(
             "status"    => "OK"
@@ -256,7 +256,7 @@ switch($_REQUEST['action']) {
                 array(
                     "type"      => "select",
                     "name"      => "label-id",
-                    "value"     => Label::getLabelById($_REQUEST['labelID'])->getName(),
+                    "value"     => Label::getLabelByID($_REQUEST['labelID'])->getName(),
                     "values"    => array()
                 ),
                 array(
@@ -281,7 +281,7 @@ switch($_REQUEST['action']) {
         break;
     case 'saveNewCall':
         header("Status: 200 OK");
-        Call::addCall($_REQUEST['userID'], $_REQUEST['callDate'], $_REQUEST['callerTelNr'], Label::getLabelByName($_REQUEST['labelID'])->getId(), $_REQUEST['callNotes']);
+        Call::addCall($_REQUEST['userID'], $_REQUEST['callDate'], $_REQUEST['callerTelNr'], Label::getLabelByName($_REQUEST['labelID'])->getID(), $_REQUEST['callNotes']);
 
         $return = array(
             "status"    => "OK"
@@ -337,7 +337,7 @@ switch($_REQUEST['action']) {
 
         $mail = Mail::getMailByMailID($_REQUEST['mailID']);
         $mailboxFolder = Mailboxfolder::getMailboxfolderByID($mail->getMailboxFolderID());
-        $mailbox = Mailbox::getMailboxById($mailboxFolder->getMailboxId(), true);
+        $mailbox = Mailbox::getMailboxByID($mailboxFolder->getMailboxID(), true);
 
         $mailbox->changeFolder($mailboxFolder->getFolderName());
         $bodyLines =  explode(PHP_EOL, imap_fetchbody($mailbox->getMailbox(), $mail->getMailUID(), 1));

includes/PhpWord/Element/AbstractContainer.php

@@ -147,7 +147,7 @@ abstract class AbstractContainer extends AbstractElement
         // Set parent container
         $element->setParentContainer($this);
         $element->setElementIndex($this->countElements() + 1);
-        $element->setElementId();
+        $element->setElementID();
 
         $this->elements[] = $element;
 

includes/PhpWord/Element/AbstractElement.php

@@ -36,11 +36,11 @@ abstract class AbstractElement
     protected $phpWord;
 
     /**
-     * Section Id
+     * Section ID
      *
      * @var int
      */
-    protected $sectionId;
+    protected $sectionID;
 
     /**
      * Document part type: Section|Header|Footer|Footnote|Endnote
@@ -54,15 +54,15 @@ abstract class AbstractElement
     protected $docPart = 'Section';
 
     /**
-     * Document part Id
+     * Document part ID
      *
-     * For header and footer, this will be = ($sectionId - 1) * 3 + $index
+     * For header and footer, this will be = ($sectionID - 1) * 3 + $index
      * because the max number of header/footer in every page is 3, i.e.
      * AUTO, FIRST, and EVEN (AUTO = ODD)
      *
      * @var int
      */
-    protected $docPartId = 1;
+    protected $docPartID = 1;
 
     /**
      * Index of element in the elements collection (start with 1)
@@ -72,18 +72,18 @@ abstract class AbstractElement
     protected $elementIndex = 1;
 
     /**
-     * Unique Id for element
+     * Unique ID for element
      *
      * @var int
      */
-    protected $elementId;
+    protected $elementID;
 
     /**
-     * Relation Id
+     * Relation ID
      *
      * @var int
      */
-    protected $relationId;
+    protected $relationID;
 
     /**
      * Depth of table container nested level; Primarily used for RTF writer/reader
@@ -141,22 +141,22 @@ abstract class AbstractElement
      *
      * @return int
      */
-    public function getSectionId()
+    public function getSectionID()
     {
-        return $this->sectionId;
+        return $this->sectionID;
     }
 
     /**
      * Set doc part.
      *
      * @param string $docPart
-     * @param int $docPartId
+     * @param int $docPartID
      * @return void
      */
-    public function setDocPart($docPart, $docPartId = 1)
+    public function setDocPart($docPart, $docPartID = 1)
     {
         $this->docPart = $docPart;
-        $this->docPartId = $docPartId;
+        $this->docPartID = $docPartID;
     }
 
     /**
@@ -170,13 +170,13 @@ abstract class AbstractElement
     }
 
     /**
-     * Get doc part Id
+     * Get doc part ID
      *
      * @return int
      */
-    public function getDocPartId()
+    public function getDocPartID()
     {
-        return $this->docPartId;
+        return $this->docPartID;
     }
 
     /**
@@ -188,7 +188,7 @@ abstract class AbstractElement
     {
         $mediaPart = $this->docPart;
         if ($mediaPart == 'Header' || $mediaPart == 'Footer') {
-            $mediaPart .= $this->docPartId;
+            $mediaPart .= $this->docPartID;
         }
 
         return strtolower($mediaPart);
@@ -220,9 +220,9 @@ abstract class AbstractElement
      *
      * @return string
      */
-    public function getElementId()
+    public function getElementID()
     {
-        return $this->elementId;
+        return $this->elementID;
     }
 
     /**
@@ -230,30 +230,30 @@ abstract class AbstractElement
      *
      * @return void
      */
-    public function setElementId()
+    public function setElementID()
     {
-        $this->elementId = substr(md5(rand()), 0, 6);
+        $this->elementID = substr(md5(rand()), 0, 6);
     }
 
     /**
-     * Get relation Id
+     * Get relation ID
      *
      * @return int
      */
-    public function getRelationId()
+    public function getRelationID()
     {
-        return $this->relationId;
+        return $this->relationID;
     }
 
     /**
-     * Set relation Id.
+     * Set relation ID.
      *
      * @param int $value
      * @return void
      */
-    public function setRelationId($value)
+    public function setRelationID($value)
     {
-        $this->relationId = $value;
+        $this->relationID = $value;
     }
 
     /**
@@ -289,7 +289,7 @@ abstract class AbstractElement
 
         // Set doc part
         if (!$this instanceof Footnote) {
-            $this->setDocPart($container->getDocPart(), $container->getDocPartId());
+            $this->setDocPart($container->getDocPart(), $container->getDocPartID());
         }
 
         $this->setMediaRelation();
@@ -297,7 +297,7 @@ abstract class AbstractElement
     }
 
     /**
-     * Set relation Id for media elements (link, image, object; legacy of OOXML)
+     * Set relation ID for media elements (link, image, object; legacy of OOXML)
      *
      * - Image element needs to be passed to Media object
      * - Icon needs to be set for Object element
@@ -317,18 +317,18 @@ abstract class AbstractElement
         if ($this instanceof Image) {
             $image = $this;
         }
-        $rId = Media::addElement($mediaPart, strtolower($elementName), $source, $image);
-        $this->setRelationId($rId);
+        $rID = Media::addElement($mediaPart, strtolower($elementName), $source, $image);
+        $this->setRelationID($rID);
 
         if ($this instanceof Object) {
             $icon = $this->getIcon();
-            $rId = Media::addElement($mediaPart, 'image', $icon, new Image($icon));
-            $this->setImageRelationId($rId);
+            $rID = Media::addElement($mediaPart, 'image', $icon, new Image($icon));
+            $this->setImageRelationID($rID);
         }
     }
 
     /**
-     * Set relation Id for elements that will be registered in the Collection subnamespaces.
+     * Set relation ID for elements that will be registered in the Collection subnamespaces.
      *
      * @return void
      */
@@ -337,8 +337,8 @@ abstract class AbstractElement
         if ($this->collectionRelation === true && $this->phpWord instanceof PhpWord) {
             $elementName = substr(get_class($this), strrpos(get_class($this), '\\') + 1);
             $addMethod = "add{$elementName}";
-            $rId = $this->phpWord->$addMethod($this);
-            $this->setRelationId($rId);
+            $rID = $this->phpWord->$addMethod($this);
+            $this->setRelationID($rID);
         }
     }
 

includes/PhpWord/Element/Footer.php

@@ -47,15 +47,15 @@ class Footer extends AbstractContainer
     /**
      * Create new instance
      *
-     * @param int $sectionId
-     * @param int $containerId
+     * @param int $sectionID
+     * @param int $containerID
      * @param string $type
      */
-    public function __construct($sectionId, $containerId = 1, $type = self::AUTO)
+    public function __construct($sectionID, $containerID = 1, $type = self::AUTO)
     {
-        $this->sectionId = $sectionId;
+        $this->sectionID = $sectionID;
         $this->setType($type);
-        $this->setDocPart($this->container, ($sectionId - 1) * 3 + $containerId);
+        $this->setDocPart($this->container, ($sectionID - 1) * 3 + $containerID);
     }
 
     /**

includes/PhpWord/Element/Footnote.php

@@ -71,20 +71,20 @@ class Footnote extends AbstractContainer
      * @deprecated 0.10.0
      * @codeCoverageIgnore
      */
-    public function getReferenceId()
+    public function getReferenceID()
     {
-        return $this->getRelationId();
+        return $this->getRelationID();
     }
 
     /**
      * Set Footnote Reference ID
      *
-     * @param int $rId
+     * @param int $rID
      * @deprecated 0.10.0
      * @codeCoverageIgnore
      */
-    public function setReferenceId($rId)
+    public function setReferenceID($rID)
     {
-        $this->setRelationId($rId);
+        $this->setRelationID($rID);
     }
 }

includes/PhpWord/Element/Image.php

@@ -173,7 +173,7 @@ class Image extends AbstractElement
      *
      * @return string
      */
-    public function getMediaId()
+    public function getMediaID()
     {
         return md5($this->source);
     }

includes/PhpWord/Element/Object.php

@@ -51,7 +51,7 @@ class Object extends AbstractElement
      *
      * @var int
      */
-    private $imageRelationId;
+    private $imageRelationID;
 
     /**
      * Has media relation flag; true for Link, Image, and Object
@@ -123,20 +123,20 @@ class Object extends AbstractElement
      *
      * @return int
      */
-    public function getImageRelationId()
+    public function getImageRelationID()
     {
-        return $this->imageRelationId;
+        return $this->imageRelationID;
     }
 
     /**
      * Set Image Relation ID.
      *
-     * @param int $rId
+     * @param int $rID
      * @return void
      */
-    public function setImageRelationId($rId)
+    public function setImageRelationID($rID)
     {
-        $this->imageRelationId = $rId;
+        $this->imageRelationID = $rID;
     }
 
     /**
@@ -146,20 +146,20 @@ class Object extends AbstractElement
      * @deprecated 0.10.0
      * @codeCoverageIgnore
      */
-    public function getObjectId()
+    public function getObjectID()
     {
-        return $this->relationId + 1325353440;
+        return $this->relationID + 1325353440;
     }
 
     /**
      * Set Object ID
      *
-     * @param int $objId
+     * @param int $objID
      * @deprecated 0.10.0
      * @codeCoverageIgnore
      */
-    public function setObjectId($objId)
+    public function setObjectID($objID)
     {
-        $this->relationId = $objId;
+        $this->relationID = $objID;
     }
 }

includes/PhpWord/Element/Section.php

@@ -59,8 +59,8 @@ class Section extends AbstractContainer
      */
     public function __construct($sectionCount, $style = null)
     {
-        $this->sectionId = $sectionCount;
-        $this->setDocPart($this->container, $this->sectionId);
+        $this->sectionID = $sectionCount;
+        $this->setDocPart($this->container, $this->sectionID);
         $this->style = new SectionStyle();
         $this->setStyle($style);
     }
@@ -169,7 +169,7 @@ class Section extends AbstractContainer
         if (in_array($type, array(Header::AUTO, Header::FIRST, Header::EVEN))) {
             $index = count($collection);
             /** @var \PhpOffice\PhpWord\Element\AbstractContainer $container Type hint */
-            $container = new $containerClass($this->sectionId, ++$index, $type);
+            $container = new $containerClass($this->sectionID, ++$index, $type);
             $container->setPhpWord($this->phpWord);
 
             $collection[$index] = $container;

includes/PhpWord/Media.php

@@ -46,18 +46,18 @@ class Media
      */
     public static function addElement($container, $mediaType, $source, Image $image = null)
     {
-        // Assign unique media Id and initiate media container if none exists
-        $mediaId = md5($container . $source);
+        // Assign unique media ID and initiate media container if none exists
+        $mediaID = md5($container . $source);
         if (!isset(self::$elements[$container])) {
             self::$elements[$container] = array();
         }
 
         // Add media if not exists or point to existing media
-        if (!isset(self::$elements[$container][$mediaId])) {
+        if (!isset(self::$elements[$container][$mediaID])) {
             $mediaCount = self::countElements($container);
             $mediaTypeCount = self::countElements($container, $mediaType);
             $mediaTypeCount++;
-            $rId = ++$mediaCount;
+            $rID = ++$mediaCount;
             $target = null;
             $mediaData = array('mediaIndex' => $mediaTypeCount);
 
@@ -95,11 +95,11 @@ class Media
             $mediaData['source'] = $source;
             $mediaData['target'] = $target;
             $mediaData['type'] = $mediaType;
-            $mediaData['rID'] = $rId;
-            self::$elements[$container][$mediaId] = $mediaData;
-            return $rId;
+            $mediaData['rID'] = $rID;
+            self::$elements[$container][$mediaID] = $mediaData;
+            return $rID;
         } else {
-            $mediaData = self::$elements[$container][$mediaId];
+            $mediaData = self::$elements[$container][$mediaID];
             if (!is_null($image)) {
                 $image->setTarget($mediaData['target']);
                 $image->setMediaIndex($mediaData['mediaIndex']);

includes/PhpWord/Metadata/DocInfo.php

@@ -525,9 +525,9 @@ class DocInfo
             self::PROPERTY_TYPE_DATE    => array('date', 'filetime'),
             self::PROPERTY_TYPE_BOOLEAN => array('bool'),
         );
-        foreach ($typeGroups as $groupId => $groupMembers) {
+        foreach ($typeGroups as $groupID => $groupMembers) {
             if (in_array($propertyType, $groupMembers)) {
-                return $groupId;
+                return $groupID;
             }
         }
 

includes/PhpWord/Reader/MsDoc.php

@@ -168,13 +168,13 @@ class MsDoc extends AbstractReader implements ReaderInterface
     {
         $pos = 0;
         //----- FibBase
-        // wIdent
+        // wIDent
         $pos += 2;
         // nFib
         $pos += 2;
         // unused
         $pos += 2;
-        // lid : Language Identifier
+        // lid : Language IDentifier
         $pos += 2;
         // pnNext
         $pos += 2;

includes/PhpWord/Reader/Word2007.php

@@ -145,7 +145,7 @@ class Word2007 extends AbstractReader implements ReaderInterface
         $xmlReader->getDomFromZip($docFile, $xmlFile);
         $nodes = $xmlReader->getElements('*');
         foreach ($nodes as $node) {
-            $rId = $xmlReader->getAttribute('Id', $node);
+            $rID = $xmlReader->getAttribute('ID', $node);
             $type = $xmlReader->getAttribute('Type', $node);
             $target = $xmlReader->getAttribute('Target', $node);
 
@@ -160,7 +160,7 @@ class Word2007 extends AbstractReader implements ReaderInterface
             }
 
             // Push to return array
-            $rels[$rId] = array('type' => $type, 'target' => $target, 'docPart' => $docPart);
+            $rels[$rID] = array('type' => $type, 'target' => $target, 'docPart' => $docPart);
         }
         ksort($rels);
 

includes/PhpWord/Reader/Word2007/AbstractPart.php

@@ -141,13 +141,13 @@ abstract class AbstractPart
         // List item
         } elseif ($xmlReader->elementExists('w:pPr/w:numPr', $domNode)) {
             $textContent = '';
-            $numId = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:numId');
-            $levelId = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:ilvl');
+            $numID = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:numID');
+            $levelID = $xmlReader->getAttribute('w:val', $domNode, 'w:pPr/w:numPr/w:ilvl');
             $nodes = $xmlReader->getElements('w:r', $domNode);
             foreach ($nodes as $node) {
                 $textContent .= $xmlReader->getValue('w:t', $node);
             }
-            $parent->addListItem($textContent, $levelId, null, "PHPWordList{$numId}", $paragraphStyle);
+            $parent->addListItem($textContent, $levelID, null, "PHPWordList{$numID}", $paragraphStyle);
 
         // Heading
         } elseif (!empty($headingMatches)) {
@@ -201,9 +201,9 @@ abstract class AbstractPart
 
         // Link
         if ($domNode->nodeName == 'w:hyperlink') {
-            $rId = $xmlReader->getAttribute('r:id', $domNode);
+            $rID = $xmlReader->getAttribute('r:id', $domNode);
             $textContent = $xmlReader->getValue('w:r/w:t', $domNode);
-            $target = $this->getMediaTarget($docPart, $rId);
+            $target = $this->getMediaTarget($docPart, $rID);
             if (!is_null($target)) {
                 $parent->addLink($target, $textContent, $fontStyle, $paragraphStyle);
             }
@@ -218,8 +218,8 @@ abstract class AbstractPart
 
             // Image
             } elseif ($xmlReader->elementExists('w:pict', $domNode)) {
-                $rId = $xmlReader->getAttribute('r:id', $domNode, 'w:pict/v:shape/v:imagedata');
-                $target = $this->getMediaTarget($docPart, $rId);
+                $rID = $xmlReader->getAttribute('r:id', $domNode, 'w:pict/v:shape/v:imagedata');
+                $target = $this->getMediaTarget($docPart, $rID);
                 if (!is_null($target)) {
                     $imageSource = "zip://{$this->docFile}#{$target}";
                     $parent->addImage($imageSource);
@@ -227,9 +227,9 @@ abstract class AbstractPart
 
             // Object
             } elseif ($xmlReader->elementExists('w:object', $domNode)) {
-                $rId = $xmlReader->getAttribute('r:id', $domNode, 'w:object/o:OLEObject');
-                // $rIdIcon = $xmlReader->getAttribute('r:id', $domNode, 'w:object/v:shape/v:imagedata');
-                $target = $this->getMediaTarget($docPart, $rId);
+                $rID = $xmlReader->getAttribute('r:id', $domNode, 'w:object/o:OLEObject');
+                // $rIDIcon = $xmlReader->getAttribute('r:id', $domNode, 'w:object/v:shape/v:imagedata');
+                $target = $this->getMediaTarget($docPart, $rID);
                 if (!is_null($target)) {
                     $textContent = "<Object: {$target}>";
                     $parent->addText($textContent, $fontStyle, $paragraphStyle);
@@ -499,15 +499,15 @@ abstract class AbstractPart
      * Returns the target of image, object, or link as stored in ::readMainRels
      *
      * @param string $docPart
-     * @param string $rId
+     * @param string $rID
      * @return string|null
      */
-    private function getMediaTarget($docPart, $rId)
+    private function getMediaTarget($docPart, $rID)
     {
         $target = null;
 
-        if (isset($this->rels[$docPart]) && isset($this->rels[$docPart][$rId])) {
-            $target = $this->rels[$docPart][$rId]['target'];
+        if (isset($this->rels[$docPart]) && isset($this->rels[$docPart][$rID])) {
+            $target = $this->rels[$docPart][$rID]['target'];
         }
 
         return $target;

includes/PhpWord/Reader/Word2007/Document.php

@@ -73,9 +73,9 @@ class Document extends AbstractPart
         $readMethods = array('w:p' => 'readParagraph', 'w:tbl' => 'readTable');
 
         if (is_array($settings) && isset($settings['hf'])) {
-            foreach ($settings['hf'] as $rId => $hfSetting) {
-                if (isset($this->rels['document'][$rId])) {
-                    list($hfType, $xmlFile, $docPart) = array_values($this->rels['document'][$rId]);
+            foreach ($settings['hf'] as $rID => $hfSetting) {
+                if (isset($this->rels['document'][$rID])) {
+                    list($hfType, $xmlFile, $docPart) = array_values($this->rels['document'][$rID]);
                     $addMethod = "add{$hfType}";
                     $hfObject = $section->$addMethod($hfSetting['type']);
 

includes/PhpWord/Reader/Word2007/Numbering.php

@@ -44,9 +44,9 @@ class Numbering extends AbstractPart
         $nodes = $xmlReader->getElements('w:abstractNum');
         if ($nodes->length > 0) {
             foreach ($nodes as $node) {
-                $abstractId = $xmlReader->getAttribute('w:abstractNumId', $node);
-                $abstracts[$abstractId] = array('levels' => array());
-                $abstract = &$abstracts[$abstractId];
+                $abstractID = $xmlReader->getAttribute('w:abstractNumID', $node);
+                $abstracts[$abstractID] = array('levels' => array());
+                $abstract = &$abstracts[$abstractID];
                 $subnodes = $xmlReader->getElements('*', $node);
                 foreach ($subnodes as $subnode) {
                     switch ($subnode->nodeName) {
@@ -54,8 +54,8 @@ class Numbering extends AbstractPart
                             $abstract['type'] = $xmlReader->getAttribute('w:val', $subnode);
                             break;
                         case 'w:lvl':
-                            $levelId = $xmlReader->getAttribute('w:ilvl', $subnode);
-                            $abstract['levels'][$levelId] = $this->readLevel($xmlReader, $subnode, $levelId);
+                            $levelID = $xmlReader->getAttribute('w:ilvl', $subnode);
+                            $abstract['levels'][$levelID] = $this->readLevel($xmlReader, $subnode, $levelID);
                             break;
                     }
                 }
@@ -66,24 +66,24 @@ class Numbering extends AbstractPart
         $nodes = $xmlReader->getElements('w:num');
         if ($nodes->length > 0) {
             foreach ($nodes as $node) {
-                $numId = $xmlReader->getAttribute('w:numId', $node);
-                $abstractId = $xmlReader->getAttribute('w:val', $node, 'w:abstractNumId');
-                $numberings[$numId] = $abstracts[$abstractId];
-                $numberings[$numId]['numId'] = $numId;
+                $numID = $xmlReader->getAttribute('w:numID', $node);
+                $abstractID = $xmlReader->getAttribute('w:val', $node, 'w:abstractNumID');
+                $numberings[$numID] = $abstracts[$abstractID];
+                $numberings[$numID]['numID'] = $numID;
                 $subnodes = $xmlReader->getElements('w:lvlOverride/w:lvl', $node);
                 foreach ($subnodes as $subnode) {
-                    $levelId = $xmlReader->getAttribute('w:ilvl', $subnode);
-                    $overrides = $this->readLevel($xmlReader, $subnode, $levelId);
+                    $levelID = $xmlReader->getAttribute('w:ilvl', $subnode);
+                    $overrides = $this->readLevel($xmlReader, $subnode, $levelID);
                     foreach ($overrides as $key => $value) {
-                        $numberings[$numId]['levels'][$levelId][$key] = $value;
+                        $numberings[$numID]['levels'][$levelID][$key] = $value;
                     }
                 }
             }
         }
 
         // Push to Style collection
-        foreach ($numberings as $numId => $numbering) {
-            $phpWord->addNumberingStyle("PHPWordList{$numId}", $numbering);
+        foreach ($numberings as $numID => $numbering) {
+            $phpWord->addNumberingStyle("PHPWordList{$numID}", $numbering);
         }
     }
 
@@ -92,14 +92,14 @@ class Numbering extends AbstractPart
      *
      * @param \PhpOffice\PhpWord\Shared\XMLReader $xmlReader
      * @param \DOMElement $subnode
-     * @param integer $levelId
+     * @param integer $levelID
      * @return array
      */
-    private function readLevel(XMLReader $xmlReader, \DOMElement $subnode, $levelId)
+    private function readLevel(XMLReader $xmlReader, \DOMElement $subnode, $levelID)
     {
         $level = array();
 
-        $level['level'] = $levelId;
+        $level['level'] = $levelID;
         $level['start'] = $xmlReader->getAttribute('w:val', $subnode, 'w:start');
         $level['format'] = $xmlReader->getAttribute('w:val', $subnode, 'w:numFmt');
         $level['restart'] = $xmlReader->getAttribute('w:val', $subnode, 'w:lvlRestart');

includes/PhpWord/Reader/Word2007/Styles.php

@@ -42,7 +42,7 @@ class Styles extends AbstractPart
         if ($nodes->length > 0) {
             foreach ($nodes as $node) {
                 $type = $xmlReader->getAttribute('w:type', $node);
-                $name = $xmlReader->getAttribute('w:styleId', $node);
+                $name = $xmlReader->getAttribute('w:styleID', $node);
                 if (is_null($name)) {
                     $name = $xmlReader->getAttribute('w:val', $node, 'w:name');
                 }

includes/PhpWord/Settings.php

@@ -205,7 +205,7 @@ class Settings
     }
 
     /**
-     * Identify the external library to use for rendering PDF files
+     * IDentify the external library to use for rendering PDF files
      *
      * @param string $libraryName
      * @return bool

includes/PhpWord/Shared/OLERead.php

@@ -207,12 +207,12 @@ class OLERead
     /**
      * Read a standard stream (by joining sectors using information from SAT)
      *
-     * @param int $blSectorId Sector ID where the stream starts
+     * @param int $blSectorID Sector ID where the stream starts
      * @return string Data for standard stream
      */
-    private function readData($blSectorId)
+    private function readData($blSectorID)
     {
-        $block = $blSectorId;
+        $block = $blSectorID;
         $data = '';
 
         while ($block != -2) {

includes/PhpWord/Shared/PCLZip/pclzip.lib.php

@@ -22,7 +22,7 @@
 //   The use of this software is at the risk of the user.
 //
 // --------------------------------------------------------------------------------
-// $Id: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
+// $ID: pclzip.lib.php,v 1.60 2009/09/30 21:01:04 vblavet Exp $
 // --------------------------------------------------------------------------------
 
   // ----- Constants

includes/PhpWord/Style/ListItem.php

@@ -56,7 +56,7 @@ class ListItem extends AbstractStyle
      * @var integer
      * @since 0.10.0
      */
-    private $numId;
+    private $numID;
 
     /**
      * Create new instance
@@ -122,21 +122,21 @@ class ListItem extends AbstractStyle
         $this->numStyle = $value;
         $numStyleObject = Style::getStyle($this->numStyle);
         if ($numStyleObject instanceof Numbering) {
-            $this->numId = $numStyleObject->getIndex();
-            $numStyleObject->setNumId($this->numId);
+            $this->numID = $numStyleObject->getIndex();
+            $numStyleObject->setNumID($this->numID);
         }
 
         return $this;
     }
 
     /**
-     * Get numbering Id
+     * Get numbering ID
      *
      * @return integer
      */
-    public function getNumId()
+    public function getNumID()
     {
-        return $this->numId;
+        return $this->numID;
     }
 
     /**

includes/PhpWord/Style/Numbering.php

@@ -33,7 +33,7 @@ class Numbering extends AbstractStyle
      * @var int
      * @link http://www.schemacentral.com/sc/ooxml/e-w_num-1.html
      */
-    private $numId;
+    private $numID;
 
     /**
      * Multilevel type singleLevel|multilevel|hybridMultilevel
@@ -51,24 +51,24 @@ class Numbering extends AbstractStyle
     private $levels = array();
 
     /**
-     * Get Id
+     * Get ID
      *
      * @return integer
      */
-    public function getNumId()
+    public function getNumID()
     {
-        return $this->numId;
+        return $this->numID;
     }
 
     /**
-     * Set Id
+     * Set ID
      *
      * @param integer $value
      * @return self
      */
-    public function setNumId($value)
+    public function setNumID($value)
     {
-        $this->numId = $this->setIntVal($value, $this->numId);
+        $this->numID = $this->setIntVal($value, $this->numID);
 
         return $this;
     }

includes/PhpWord/Writer/HTML.php

@@ -115,13 +115,13 @@ class HTML extends AbstractWriter implements WriterInterface
     /**
      * Add note.
      *
-     * @param int $noteId
+     * @param int $noteID
      * @param string $noteMark
      * @return void
      */
-    public function addNote($noteId, $noteMark)
+    public function addNote($noteID, $noteMark)
     {
-        $this->notes[$noteId] = $noteMark;
+        $this->notes[$noteID] = $noteMark;
     }
 
     /**

includes/PhpWord/Writer/HTML/Element/Footnote.php

@@ -44,11 +44,11 @@ class Footnote extends AbstractElement
         /** @var \PhpOffice\PhpWord\Writer\HTML $parentWriter Type hint */
         $parentWriter = $this->parentWriter;
 
-        $noteId = count($parentWriter->getNotes()) + 1;
-        $noteMark = $this->noteType . '-' . $this->element->getRelationId();
-        $content = "<a name=\"{$noteMark}\"><a href=\"#note-{$noteId}\" class=\"NoteRef\"><sup>{$noteId}</sup></a>";
+        $noteID = count($parentWriter->getNotes()) + 1;
+        $noteMark = $this->noteType . '-' . $this->element->getRelationID();
+        $content = "<a name=\"{$noteMark}\"><a href=\"#note-{$noteID}\" class=\"NoteRef\"><sup>{$noteID}</sup></a>";
 
-        $parentWriter->addNote($noteId, $noteMark);
+        $parentWriter->addNote($noteID, $noteMark);
 
         return $content;
     }

includes/PhpWord/Writer/HTML/Part/Body.php

@@ -67,15 +67,15 @@ class Body extends AbstractPart
 
         if (!empty($notes)) {
             $content .= "<hr />" . PHP_EOL;
-            foreach ($notes as $noteId => $noteMark) {
-                list($noteType, $noteTypeId) = explode('-', $noteMark);
+            foreach ($notes as $noteID => $noteMark) {
+                list($noteType, $noteTypeID) = explode('-', $noteMark);
                 $method = 'get' . ($noteType == 'endnote' ? 'Endnotes' : 'Footnotes');
                 $collection = $phpWord->$method()->getItems();
 
-                if (isset($collection[$noteTypeId])) {
-                    $element = $collection[$noteTypeId];
-                    $noteAnchor = "<a name=\"note-{$noteId}\" />";
-                    $noteAnchor .= "<a href=\"#{$noteMark}\" class=\"NoteRef\"><sup>{$noteId}</sup></a>";
+                if (isset($collection[$noteTypeID])) {
+                    $element = $collection[$noteTypeID];
+                    $noteAnchor = "<a name=\"note-{$noteID}\" />";
+                    $noteAnchor .= "<a href=\"#{$noteMark}\" class=\"NoteRef\"><sup>{$noteID}</sup></a>";
 
                     $writer = new TextRunWriter($this->getParentWriter(), $element);
                     $writer->setOpeningText($noteAnchor);

includes/PhpWord/Writer/ODText/Element/Image.php

@@ -48,7 +48,7 @@ class Image extends AbstractElement
 
         $xmlWriter->startElement('draw:frame');
         $xmlWriter->writeAttribute('draw:style-name', 'fr' . $mediaIndex);
-        $xmlWriter->writeAttribute('draw:name', $element->getElementId());
+        $xmlWriter->writeAttribute('draw:name', $element->getElementID());
         $xmlWriter->writeAttribute('text:anchor-type', 'as-char');
         $xmlWriter->writeAttribute('svg:width', $width . 'cm');
         $xmlWriter->writeAttribute('svg:height', $height . 'cm');

includes/PhpWord/Writer/ODText/Element/Table.php

@@ -40,8 +40,8 @@ class Table extends AbstractElement
 
         if ($rowCount > 0) {
             $xmlWriter->startElement('table:table');
-            $xmlWriter->writeAttribute('table:name', $element->getElementId());
-            $xmlWriter->writeAttribute('table:style', $element->getElementId());
+            $xmlWriter->writeAttribute('table:name', $element->getElementID());
+            $xmlWriter->writeAttribute('table:style', $element->getElementID());
 
             $xmlWriter->startElement('table:table-column');
             $xmlWriter->writeAttribute('table:number-columns-repeated', $colCount);

includes/PhpWord/Writer/ODText/Part/Content.php

@@ -88,7 +88,7 @@ class Content extends AbstractPart
         // Sections
         $sections = $phpWord->getSections();
         foreach ($sections as $section) {
-            $name = 'Section' . $section->getSectionId();
+            $name = 'Section' . $section->getSectionID();
             $xmlWriter->startElement('text:section');
             $xmlWriter->writeAttribute('text:name', $name);
             $xmlWriter->writeAttribute('text:style-name', $name);
@@ -178,7 +178,7 @@ class Content extends AbstractPart
         $fontStyleCount = 0;
         foreach ($sections as $section) {
             $style = $section->getStyle();
-            $style->setStyleName("Section{$section->getSectionId()}");
+            $style->setStyleName("Section{$section->getSectionID()}");
             $this->autoStyles['Section'][] = $style;
             $this->getContainerStyle($section, $paragraphStyleCount, $fontStyleCount);
         }
@@ -214,7 +214,7 @@ class Content extends AbstractPart
                 } elseif (is_string($style)) {
                     $style = Style::getStyle($style);
                 }
-                $style->setStyleName($element->getElementId());
+                $style->setStyleName($element->getElementID());
                 $this->autoStyles['Table'][] = $style;
             }
         }

includes/PhpWord/Writer/Word2007.php

@@ -120,16 +120,16 @@ class Word2007 extends AbstractWriter implements WriterInterface
         $this->addHeaderFooterMedia($zip, 'footer');
 
         // Add header/footer contents
-        $rId = Media::countElements('section') + 6; // @see Rels::writeDocRels for 6 first elements
+        $rID = Media::countElements('section') + 6; // @see Rels::writeDocRels for 6 first elements
         $sections = $phpWord->getSections();
         foreach ($sections as $section) {
-            $this->addHeaderFooterContent($section, $zip, 'header', $rId);
-            $this->addHeaderFooterContent($section, $zip, 'footer', $rId);
+            $this->addHeaderFooterContent($section, $zip, 'header', $rID);
+            $this->addHeaderFooterContent($section, $zip, 'footer', $rID);
         }
 
-        $this->addNotes($zip, $rId, 'footnote');
-        $this->addNotes($zip, $rId, 'endnote');
-        $this->addChart($zip, $rId);
+        $this->addNotes($zip, $rID, 'footnote');
+        $this->addNotes($zip, $rID, 'endnote');
+        $this->addChart($zip, $rID);
 
         // Write parts
         foreach ($this->parts as $partName => $fileName) {
@@ -195,21 +195,21 @@ class Word2007 extends AbstractWriter implements WriterInterface
      * @param \PhpOffice\PhpWord\Element\Section &$section
      * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
      * @param string $elmType header|footer
-     * @param integer &$rId
+     * @param integer &$rID
      * @return void
      */
-    private function addHeaderFooterContent(Section &$section, ZipArchive $zip, $elmType, &$rId)
+    private function addHeaderFooterContent(Section &$section, ZipArchive $zip, $elmType, &$rID)
     {
         $getFunction = $elmType == 'header' ? 'getHeaders' : 'getFooters';
-        $elmCount = ($section->getSectionId() - 1) * 3;
+        $elmCount = ($section->getSectionID() - 1) * 3;
         $elements = $section->$getFunction();
         foreach ($elements as &$element) {
             /** @var \PhpOffice\PhpWord\Element\AbstractElement $element Type hint */
             $elmCount++;
-            $element->setRelationId(++$rId);
+            $element->setRelationID(++$rID);
             $elmFile = "{$elmType}{$elmCount}.xml"; // e.g. footer1.xml
             $this->contentTypes['override']["/word/$elmFile"] = $elmType;
-            $this->relationships[] = array('target' => $elmFile, 'type' => $elmType, 'rID' => $rId);
+            $this->relationships[] = array('target' => $elmFile, 'type' => $elmType, 'rID' => $rID);
 
             /** @var \PhpOffice\PhpWord\Writer\Word2007\Part\AbstractPart $writerPart Type hint */
             $writerPart = $this->getWriterPart($elmType)->setElement($element);
@@ -221,11 +221,11 @@ class Word2007 extends AbstractWriter implements WriterInterface
      * Add footnotes/endnotes
      *
      * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
-     * @param integer &$rId
+     * @param integer &$rID
      * @param string $noteType
      * @return void
      */
-    private function addNotes(ZipArchive $zip, &$rId, $noteType = 'footnote')
+    private function addNotes(ZipArchive $zip, &$rID, $noteType = 'footnote')
     {
         $phpWord = $this->getPhpWord();
         $noteType = ($noteType == 'endnote') ? 'endnote' : 'footnote';
@@ -240,7 +240,7 @@ class Word2007 extends AbstractWriter implements WriterInterface
             $this->addFilesToPackage($zip, $media);
             $this->registerContentTypes($media);
             $this->contentTypes['override']["/word/{$partName}.xml"] = $partName;
-            $this->relationships[] = array('target' => "{$partName}.xml", 'type' => $partName, 'rID' => ++$rId);
+            $this->relationships[] = array('target' => "{$partName}.xml", 'type' => $partName, 'rID' => ++$rID);
 
             // Write relationships file, e.g. word/_rels/footnotes.xml
             if (!empty($media)) {
@@ -259,10 +259,10 @@ class Word2007 extends AbstractWriter implements WriterInterface
      * Add chart.
      *
      * @param \PhpOffice\PhpWord\Shared\ZipArchive $zip
-     * @param integer &$rId
+     * @param integer &$rID
      * @return void
      */
-    private function addChart(ZipArchive $zip, &$rId)
+    private function addChart(ZipArchive $zip, &$rID)
     {
         $phpWord = $this->getPhpWord();
 
@@ -271,18 +271,18 @@ class Word2007 extends AbstractWriter implements WriterInterface
         if ($collection->countItems() > 0) {
             foreach ($collection->getItems() as $chart) {
                 $index++;
-                $rId++;
+                $rID++;
                 $filename = "charts/chart{$index}.xml";
 
                 // ContentTypes.xml
                 $this->contentTypes['override']["/word/{$filename}"] = 'chart';
 
                 // word/_rels/document.xml.rel
-                $this->relationships[] = array('target' => $filename, 'type' => 'chart', 'rID' => $rId);
+                $this->relationships[] = array('target' => $filename, 'type' => 'chart', 'rID' => $rID);
 
                 // word/charts/chartN.xml
                 /** @var \PhpOffice\PhpWord\Element\Chart $chart */
-                $chart->setRelationId($rId);
+                $chart->setRelationID($rID);
                 $writerPart = $this->getWriterPart('Chart');
                 $writerPart->setElement($chart);
                 $zip->addFromString("word/{$filename}", $writerPart->write());

includes/PhpWord/Writer/Word2007/Element/Bookmark.php

@@ -35,15 +35,15 @@ class Bookmark extends AbstractElement
             return;
         }
 
-        $rId = $element->getRelationId();
+        $rID = $element->getRelationID();
 
         $xmlWriter->startElement('w:bookmarkStart');
-        $xmlWriter->writeAttribute('w:id', $rId);
+        $xmlWriter->writeAttribute('w:id', $rID);
         $xmlWriter->writeAttribute('w:name', $element->getName());
         $xmlWriter->endElement();
         
         $xmlWriter->startElement('w:bookmarkEnd');
-        $xmlWriter->writeAttribute('w:id', $rId);
+        $xmlWriter->writeAttribute('w:id', $rID);
         $xmlWriter->endElement();
     }
 }

includes/PhpWord/Writer/Word2007/Element/Chart.php

@@ -39,7 +39,7 @@ class Chart extends AbstractElement
             return;
         }
 
-        $rId = $element->getRelationId();
+        $rID = $element->getRelationID();
         $style = $element->getStyle();
 
         if (!$this->withoutP) {
@@ -52,7 +52,7 @@ class Chart extends AbstractElement
 
         // EMU
         $xmlWriter->writeElementBlock('wp:extent', array('cx' => $style->getWidth(), 'cy' => $style->getHeight()));
-        $xmlWriter->writeElementBlock('wp:docPr', array('id' => $rId, 'name' => "Chart{$rId}"));
+        $xmlWriter->writeElementBlock('wp:docPr', array('id' => $rID, 'name' => "Chart{$rID}"));
 
         $xmlWriter->startElement('a:graphic');
         $xmlWriter->writeAttribute('xmlns:a', 'http://schemas.openxmlformats.org/drawingml/2006/main');
@@ -60,7 +60,7 @@ class Chart extends AbstractElement
         $xmlWriter->writeAttribute('uri', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
 
         $xmlWriter->startElement('c:chart');
-        $xmlWriter->writeAttribute('r:id', "rId{$rId}");
+        $xmlWriter->writeAttribute('r:id', "rID{$rID}");
         $xmlWriter->writeAttribute('xmlns:c', 'http://schemas.openxmlformats.org/drawingml/2006/chart');
         $xmlWriter->writeAttribute('xmlns:r', 'http://schemas.openxmlformats.org/officeDocument/2006/relationships');
         $xmlWriter->endElement(); // c:chart

includes/PhpWord/Writer/Word2007/Element/Footnote.php

@@ -53,7 +53,7 @@ class Footnote extends Text
         $xmlWriter->endElement(); // w:rStyle
         $xmlWriter->endElement(); // w:rPr
         $xmlWriter->startElement("w:{$this->referenceType}");
-        $xmlWriter->writeAttribute('w:id', $element->getRelationId());
+        $xmlWriter->writeAttribute('w:id', $element->getRelationID());
         $xmlWriter->endElement(); // w:$referenceType
         $xmlWriter->endElement(); // w:r
 

includes/PhpWord/Writer/Word2007/Element/FormField.php

@@ -53,7 +53,7 @@ class FormField extends Text
         $writeFormField = "write{$type}";
         $name = $element->getName();
         if ($name === null) {
-            $name = $type . $element->getElementId();
+            $name = $type . $element->getElementID();
         }
         $value = $element->getValue();
         if ($value === null) {

includes/PhpWord/Writer/Word2007/Element/Image.php

@@ -55,7 +55,7 @@ class Image extends AbstractElement
      */
     private function writeImage(XMLWriter $xmlWriter, ImageElement $element)
     {
-        $rId = $element->getRelationId() + ($element->isInSection() ? 6 : 0);
+        $rID = $element->getRelationID() + ($element->isInSection() ? 6 : 0);
         $style = $element->getStyle();
         $styleWriter = new ImageStyleWriter($xmlWriter, $style);
 
@@ -72,7 +72,7 @@ class Image extends AbstractElement
         $styleWriter->write();
 
         $xmlWriter->startElement('v:imagedata');
-        $xmlWriter->writeAttribute('r:id', 'rId' . $rId);
+        $xmlWriter->writeAttribute('r:id', 'rID' . $rID);
         $xmlWriter->writeAttribute('o:title', '');
         $xmlWriter->endElement(); // v:imagedata
 
@@ -90,7 +90,7 @@ class Image extends AbstractElement
      */
     private function writeWatermark(XMLWriter $xmlWriter, ImageElement $element)
     {
-        $rId = $element->getRelationId();
+        $rID = $element->getRelationID();
         $style = $element->getStyle();
         $style->setPositioning('absolute');
         $styleWriter = new ImageStyleWriter($xmlWriter, $style);
@@ -104,7 +104,7 @@ class Image extends AbstractElement
         $styleWriter->write();
 
         $xmlWriter->startElement('v:imagedata');
-        $xmlWriter->writeAttribute('r:id', 'rId' . $rId);
+        $xmlWriter->writeAttribute('r:id', 'rID' . $rID);
         $xmlWriter->writeAttribute('o:title', '');
         $xmlWriter->endElement(); // v:imagedata
         $xmlWriter->endElement(); // v:shape

includes/PhpWord/Writer/Word2007/Element/Line.php

@@ -42,7 +42,7 @@ class Line extends AbstractElement
         $style = $element->getStyle();
         $styleWriter = new LineStyleWriter($xmlWriter, $style);
 
-        $elementId = $element->getElementIndex();
+        $elementID = $element->getElementIndex();
 
         if (!$this->withoutP) {
             $xmlWriter->startElement('w:p');
@@ -53,7 +53,7 @@ class Line extends AbstractElement
         $xmlWriter->startElement('w:pict');
 
         // Shapetype could be defined for each line separately, but then a unique id would be necessary
-        if ($elementId == 1) {
+        if ($elementID == 1) {
             $xmlWriter->startElement('v:shapetype');
             $xmlWriter->writeAttribute('id', '_x0000_t32');
             $xmlWriter->writeAttribute('coordsize', '21600,21600');
@@ -74,7 +74,7 @@ class Line extends AbstractElement
         }
 
         $xmlWriter->startElement('v:shape');
-        $xmlWriter->writeAttribute('id', sprintf('_x0000_s1%1$03d', $elementId));
+        $xmlWriter->writeAttribute('id', sprintf('_x0000_s1%1$03d', $elementID));
         $xmlWriter->writeAttribute('type', '#_x0000_t32'); //type should correspond to shapetype id
 
         $styleWriter->write();

includes/PhpWord/Writer/Word2007/Element/Link.php

@@ -37,7 +37,7 @@ class Link extends Text
             return;
         }
 
-        $rId = $element->getRelationId() + ($element->isInSection() ? 6 : 0);
+        $rID = $element->getRelationID() + ($element->isInSection() ? 6 : 0);
 
         $this->startElementP();
 
@@ -45,7 +45,7 @@ class Link extends Text
         if ($element->isInternal()) {
             $xmlWriter->writeAttribute('w:anchor', $element->getSource());
         } else {
-            $xmlWriter->writeAttribute('r:id', 'rId' . $rId);
+            $xmlWriter->writeAttribute('r:id', 'rID' . $rID);
         }
         $xmlWriter->writeAttribute('w:history', '1');
         $xmlWriter->startElement('w:r');

includes/PhpWord/Writer/Word2007/Element/ListItem.php

@@ -54,9 +54,9 @@ class ListItem extends AbstractElement
         $xmlWriter->startElement('w:ilvl');
         $xmlWriter->writeAttribute('w:val', $element->getDepth());
         $xmlWriter->endElement(); // w:ilvl
-        $xmlWriter->startElement('w:numId');
-        $xmlWriter->writeAttribute('w:val', $element->getStyle()->getNumId());
-        $xmlWriter->endElement(); // w:numId
+        $xmlWriter->startElement('w:numID');
+        $xmlWriter->writeAttribute('w:val', $element->getStyle()->getNumID());
+        $xmlWriter->endElement(); // w:numID
         $xmlWriter->endElement(); // w:numPr
 
         $xmlWriter->endElement(); // w:pPr

includes/PhpWord/Writer/Word2007/Element/ListItemRun.php

@@ -51,9 +51,9 @@ class ListItemRun extends AbstractElement
         $xmlWriter->startElement('w:ilvl');
         $xmlWriter->writeAttribute('w:val', $element->getDepth());
         $xmlWriter->endElement(); // w:ilvl
-        $xmlWriter->startElement('w:numId');
-        $xmlWriter->writeAttribute('w:val', $element->getStyle()->getNumId());
-        $xmlWriter->endElement(); // w:numId
+        $xmlWriter->startElement('w:numID');
+        $xmlWriter->writeAttribute('w:val', $element->getStyle()->getNumID());
+        $xmlWriter->endElement(); // w:numID
         $xmlWriter->endElement(); // w:numPr
 
         $xmlWriter->endElement(); // w:pPr

includes/PhpWord/Writer/Word2007/Element/Object.php

@@ -39,10 +39,10 @@ class Object extends AbstractElement
             return;
         }
 
-        $rIdObject = $element->getRelationId() + ($element->isInSection() ? 6 : 0);
-        $rIdImage = $element->getImageRelationId() + ($element->isInSection() ? 6 : 0);
-        $shapeId = md5($rIdObject . '_' . $rIdImage);
-        $objectId = $element->getRelationId() + 1325353440;
+        $rIDObject = $element->getRelationID() + ($element->isInSection() ? 6 : 0);
+        $rIDImage = $element->getImageRelationID() + ($element->isInSection() ? 6 : 0);
+        $shapeID = md5($rIDObject . '_' . $rIDImage);
+        $objectID = $element->getRelationID() + 1325353440;
 
         $style = $element->getStyle();
         $styleWriter = new ImageStyleWriter($xmlWriter, $style);
@@ -59,13 +59,13 @@ class Object extends AbstractElement
 
         // Icon
         $xmlWriter->startElement('v:shape');
-        $xmlWriter->writeAttribute('id', $shapeId);
+        $xmlWriter->writeAttribute('id', $shapeID);
         $xmlWriter->writeAttribute('type', '#_x0000_t75');
         $xmlWriter->writeAttribute('style', 'width:104px;height:67px');
         $xmlWriter->writeAttribute('o:ole', '');
 
         $xmlWriter->startElement('v:imagedata');
-        $xmlWriter->writeAttribute('r:id', 'rId' . $rIdImage);
+        $xmlWriter->writeAttribute('r:id', 'rID' . $rIDImage);
         $xmlWriter->writeAttribute('o:title', '');
         $xmlWriter->endElement(); // v:imagedata
 
@@ -75,10 +75,10 @@ class Object extends AbstractElement
         $xmlWriter->startElement('o:OLEObject');
         $xmlWriter->writeAttribute('Type', 'Embed');
         $xmlWriter->writeAttribute('ProgID', 'Package');
-        $xmlWriter->writeAttribute('ShapeID', $shapeId);
+        $xmlWriter->writeAttribute('ShapeID', $shapeID);
         $xmlWriter->writeAttribute('DrawAspect', 'Icon');
-        $xmlWriter->writeAttribute('ObjectID', '_' . $objectId);
-        $xmlWriter->writeAttribute('r:id', 'rId' . $rIdObject);
+        $xmlWriter->writeAttribute('ObjectID', '_' . $objectID);
+        $xmlWriter->writeAttribute('r:id', 'rID' . $rIDObject);
         $xmlWriter->endElement(); // o:OLEObject
 
         $xmlWriter->endElement(); // w:object

includes/PhpWord/Writer/Word2007/Element/TOC.php

@@ -77,7 +77,7 @@ class TOC extends AbstractElement
         $tocStyle = $element->getStyleTOC();
         $fontStyle = $element->getStyleFont();
         $isObject = ($fontStyle instanceof Font) ? true : false;
-        $rId = $title->getRelationId();
+        $rID = $title->getRelationID();
         $indent = ($title->getDepth() - 1) * $tocStyle->getIndent();
 
         $xmlWriter->startElement('w:p');
@@ -90,7 +90,7 @@ class TOC extends AbstractElement
 
         // Hyperlink
         $xmlWriter->startElement('w:hyperlink');
-        $xmlWriter->writeAttribute('w:anchor', "_Toc{$rId}");
+        $xmlWriter->writeAttribute('w:anchor', "_Toc{$rID}");
         $xmlWriter->writeAttribute('w:history', '1');
 
         // Title text
@@ -117,7 +117,7 @@ class TOC extends AbstractElement
         $xmlWriter->startElement('w:r');
         $xmlWriter->startElement('w:instrText');
         $xmlWriter->writeAttribute('xml:space', 'preserve');
-        $xmlWriter->writeRaw("PAGEREF _Toc{$rId} \h");
+        $xmlWriter->writeRaw("PAGEREF _Toc{$rID} \h");
         $xmlWriter->endElement();
         $xmlWriter->endElement();
 

includes/PhpWord/Writer/Word2007/Element/Title.php

@@ -49,13 +49,13 @@ class Title extends AbstractElement
             $xmlWriter->endElement();
         }
 
-        $rId = $element->getRelationId();
-        $bookmarkRId = $element->getPhpWord()->addBookmark();
+        $rID = $element->getRelationID();
+        $bookmarkRID = $element->getPhpWord()->addBookmark();
 
         // Bookmark start for TOC
         $xmlWriter->startElement('w:bookmarkStart');
-        $xmlWriter->writeAttribute('w:id', $bookmarkRId);
-        $xmlWriter->writeAttribute('w:name', "_Toc{$rId}");
+        $xmlWriter->writeAttribute('w:id', $bookmarkRID);
+        $xmlWriter->writeAttribute('w:name', "_Toc{$rID}");
         $xmlWriter->endElement();
 
         // Actual text
@@ -67,7 +67,7 @@ class Title extends AbstractElement
 
         // Bookmark end
         $xmlWriter->startElement('w:bookmarkEnd');
-        $xmlWriter->writeAttribute('w:id', $bookmarkRId);
+        $xmlWriter->writeAttribute('w:id', $bookmarkRID);
         $xmlWriter->endElement();
 
         $xmlWriter->endElement();

includes/PhpWord/Writer/Word2007/Part/Chart.php

@@ -162,8 +162,8 @@ class Chart extends AbstractPart
 
         // Axes
         if (isset($this->options['axes'])) {
-            $xmlWriter->writeElementBlock('c:axId', 'val', 1);
-            $xmlWriter->writeElementBlock('c:axId', 'val', 2);
+            $xmlWriter->writeElementBlock('c:axID', 'val', 1);
+            $xmlWriter->writeElementBlock('c:axID', 'val', 2);
         }
 
         $xmlWriter->endElement(); // chart type
@@ -268,11 +268,11 @@ class Chart extends AbstractPart
             'cat' => array('c:catAx', 1, 'b', 2),
             'val' => array('c:valAx', 2, 'l', 1),
         );
-        list($axisType, $axisId, $axisPos, $axisCross) = $types[$type];
+        list($axisType, $axisID, $axisPos, $axisCross) = $types[$type];
 
         $xmlWriter->startElement($axisType);
 
-        $xmlWriter->writeElementBlock('c:axId', 'val', $axisId);
+        $xmlWriter->writeElementBlock('c:axID', 'val', $axisID);
         $xmlWriter->writeElementBlock('c:axPos', 'val', $axisPos);
         $xmlWriter->writeElementBlock('c:crossAx', 'val', $axisCross);
         $xmlWriter->writeElementBlock('c:auto', 'val', 1);

includes/PhpWord/Writer/Word2007/Part/Document.php

@@ -107,19 +107,19 @@ class Document extends AbstractPart
 
         // Header reference
         foreach ($section->getHeaders() as $header) {
-            $rId = $header->getRelationId();
+            $rID = $header->getRelationID();
             $xmlWriter->startElement('w:headerReference');
             $xmlWriter->writeAttribute('w:type', $header->getType());
-            $xmlWriter->writeAttribute('r:id', 'rId' . $rId);
+            $xmlWriter->writeAttribute('r:id', 'rID' . $rID);
             $xmlWriter->endElement();
         }
 
         // Footer reference
         foreach ($section->getFooters() as $footer) {
-            $rId = $footer->getRelationId();
+            $rID = $footer->getRelationID();
             $xmlWriter->startElement('w:footerReference');
             $xmlWriter->writeAttribute('w:type', $footer->getType());
-            $xmlWriter->writeAttribute('r:id', 'rId' . $rId);
+            $xmlWriter->writeAttribute('r:id', 'rID' . $rID);
             $xmlWriter->endElement();
         }
 

includes/PhpWord/Writer/Word2007/Part/Footnotes.php

@@ -142,7 +142,7 @@ class Footnotes extends AbstractPart
     protected function writeNote(XMLWriter $xmlWriter, $element)
     {
         $xmlWriter->startElement($this->elementNode);
-        $xmlWriter->writeAttribute('w:id', $element->getRelationId());
+        $xmlWriter->writeAttribute('w:id', $element->getRelationID());
         $xmlWriter->startElement('w:p');
 
         // Paragraph style

includes/PhpWord/Writer/Word2007/Part/Numbering.php

@@ -58,7 +58,7 @@ class Numbering extends AbstractPart
                 $levels = $style->getLevels();
 
                 $xmlWriter->startElement('w:abstractNum');
-                $xmlWriter->writeAttribute('w:abstractNumId', $style->getIndex());
+                $xmlWriter->writeAttribute('w:abstractNumID', $style->getIndex());
 
                 $xmlWriter->startElement('w:nsid');
                 $xmlWriter->writeAttribute('w:val', $this->getRandomHexNumber());
@@ -81,10 +81,10 @@ class Numbering extends AbstractPart
         foreach ($styles as $style) {
             if ($style instanceof NumberingStyle) {
                 $xmlWriter->startElement('w:num');
-                $xmlWriter->writeAttribute('w:numId', $style->getIndex());
-                $xmlWriter->startElement('w:abstractNumId');
+                $xmlWriter->writeAttribute('w:numID', $style->getIndex());
+                $xmlWriter->startElement('w:abstractNumID');
                 $xmlWriter->writeAttribute('w:val', $style->getIndex());
-                $xmlWriter->endElement(); // w:abstractNumId
+                $xmlWriter->endElement(); // w:abstractNumID
                 $xmlWriter->endElement(); // w:num
             }
         }

includes/PhpWord/Writer/Word2007/Part/Rels.php

@@ -52,10 +52,10 @@ class Rels extends AbstractPart
      * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
      * @param array $xmlRels
      * @param array $mediaRels
-     * @param int $relId
+     * @param int $relID
      * @return void
      */
-    protected function writeRels(XMLWriter $xmlWriter, $xmlRels = array(), $mediaRels = array(), $relId = 1)
+    protected function writeRels(XMLWriter $xmlWriter, $xmlRels = array(), $mediaRels = array(), $relID = 1)
     {
         $xmlWriter->startDocument('1.0', 'UTF-8', 'yes');
         $xmlWriter->startElement('Relationships');
@@ -63,12 +63,12 @@ class Rels extends AbstractPart
 
         // XML files relationships
         foreach ($xmlRels as $target => $type) {
-            $this->writeRel($xmlWriter, $relId++, $type, $target);
+            $this->writeRel($xmlWriter, $relID++, $type, $target);
         }
 
         // Media relationships
         foreach ($mediaRels as $mediaRel) {
-            $this->writeMediaRel($xmlWriter, $relId++, $mediaRel);
+            $this->writeMediaRel($xmlWriter, $relID++, $mediaRel);
         }
 
         $xmlWriter->endElement(); // Relationships
@@ -78,11 +78,11 @@ class Rels extends AbstractPart
      * Write media relationships.
      *
      * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param int $relId
+     * @param int $relID
      * @param array $mediaRel
      * @return void
      */
-    private function writeMediaRel(XMLWriter $xmlWriter, $relId, $mediaRel)
+    private function writeMediaRel(XMLWriter $xmlWriter, $relID, $mediaRel)
     {
         $typePrefix = 'officeDocument/2006/relationships/';
         $typeMapping = array('image' => 'image', 'object' => 'oleObject', 'link' => 'hyperlink');
@@ -94,31 +94,31 @@ class Rels extends AbstractPart
         $target = $mediaRel['target'];
         $targetMode = ($type == 'hyperlink') ? 'External' : '';
 
-        $this->writeRel($xmlWriter, $relId, $typePrefix . $type, $targetPrefix . $target, $targetMode);
+        $this->writeRel($xmlWriter, $relID, $typePrefix . $type, $targetPrefix . $target, $targetMode);
     }
 
     /**
      * Write individual rels entry.
      *
      * Format:
-     * <Relationship Id="rId..." Type="http://..." Target="....xml" TargetMode="..." />
+     * <Relationship ID="rID..." Type="http://..." Target="....xml" TargetMode="..." />
      *
      * @param \PhpOffice\PhpWord\Shared\XMLWriter $xmlWriter
-     * @param int $relId Relationship ID
+     * @param int $relID Relationship ID
      * @param string $type Relationship type
      * @param string $target Relationship target
      * @param string $targetMode Relationship target mode
      * @return void
      * @throws \PhpOffice\PhpWord\Exception\Exception
      */
-    private function writeRel(XMLWriter $xmlWriter, $relId, $type, $target, $targetMode = '')
+    private function writeRel(XMLWriter $xmlWriter, $relID, $type, $target, $targetMode = '')
     {
         if ($type != '' && $target != '') {
-            if (strpos($relId, 'rId') === false) {
-                $relId = 'rId' . $relId;
+            if (strpos($relID, 'rID') === false) {
+                $relID = 'rID' . $relID;
             }
             $xmlWriter->startElement('Relationship');
-            $xmlWriter->writeAttribute('Id', $relId);
+            $xmlWriter->writeAttribute('ID', $relID);
             $xmlWriter->writeAttribute('Type', 'http://schemas.openxmlformats.org/' . $type);
             $xmlWriter->writeAttribute('Target', $target);
             if ($targetMode != '') {

includes/PhpWord/Writer/Word2007/Part/Styles.php

@@ -110,7 +110,7 @@ class Styles extends AbstractPart
         $xmlWriter->startElement('w:style');
         $xmlWriter->writeAttribute('w:type', 'paragraph');
         $xmlWriter->writeAttribute('w:default', '1');
-        $xmlWriter->writeAttribute('w:styleId', 'Normal');
+        $xmlWriter->writeAttribute('w:styleID', 'Normal');
         $xmlWriter->startElement('w:name');
         $xmlWriter->writeAttribute('w:val', 'Normal');
         $xmlWriter->endElement(); // w:name
@@ -124,7 +124,7 @@ class Styles extends AbstractPart
         if (!isset($styles['FootnoteReference'])) {
             $xmlWriter->startElement('w:style');
             $xmlWriter->writeAttribute('w:type', 'character');
-            $xmlWriter->writeAttribute('w:styleId', 'FootnoteReference');
+            $xmlWriter->writeAttribute('w:styleID', 'FootnoteReference');
             $xmlWriter->startElement('w:name');
             $xmlWriter->writeAttribute('w:val', 'Footnote Reference');
             $xmlWriter->endElement(); // w:name
@@ -162,10 +162,10 @@ class Styles extends AbstractPart
         // Heading style
         if ($styleType == 'title') {
             $arrStyle = explode('_', $styleName);
-            $styleId = 'Heading' . $arrStyle[1];
+            $styleID = 'Heading' . $arrStyle[1];
             $styleName = 'heading ' . $arrStyle[1];
             $styleLink = 'Heading' . $arrStyle[1] . 'Char';
-            $xmlWriter->writeAttribute('w:styleId', $styleId);
+            $xmlWriter->writeAttribute('w:styleID', $styleID);
 
             $xmlWriter->startElement('w:link');
             $xmlWriter->writeAttribute('w:val', $styleLink);
@@ -206,7 +206,7 @@ class Styles extends AbstractPart
         $xmlWriter->startElement('w:style');
         $xmlWriter->writeAttribute('w:type', 'paragraph');
         $xmlWriter->writeAttribute('w:customStyle', '1');
-        $xmlWriter->writeAttribute('w:styleId', $styleName);
+        $xmlWriter->writeAttribute('w:styleID', $styleName);
         $xmlWriter->startElement('w:name');
         $xmlWriter->writeAttribute('w:val', $styleName);
         $xmlWriter->endElement();
@@ -239,7 +239,7 @@ class Styles extends AbstractPart
         $xmlWriter->startElement('w:style');
         $xmlWriter->writeAttribute('w:type', 'table');
         $xmlWriter->writeAttribute('w:customStyle', '1');
-        $xmlWriter->writeAttribute('w:styleId', $styleName);
+        $xmlWriter->writeAttribute('w:styleID', $styleName);
         $xmlWriter->startElement('w:name');
         $xmlWriter->writeAttribute('w:val', $styleName);
         $xmlWriter->endElement();

includes/PhpWord/Writer/Word2007/Style/Paragraph.php

@@ -164,9 +164,9 @@ class Paragraph extends AbstractStyle
         $numbering = Style::getStyle($numStyle);
         if ($numStyle !== null && $numbering !== null) {
             $xmlWriter->startElement('w:numPr');
-            $xmlWriter->startElement('w:numId');
+            $xmlWriter->startElement('w:numID');
             $xmlWriter->writeAttribute('w:val', $numbering->getIndex());
-            $xmlWriter->endElement(); // w:numId
+            $xmlWriter->endElement(); // w:numID
             $xmlWriter->startElement('w:ilvl');
             $xmlWriter->writeAttribute('w:val', $numLevel);
             $xmlWriter->endElement(); // w:ilvl

includes/controller.inc.php

@@ -62,13 +62,13 @@ class Controller {
 					$documentView->setTemplate('documentlist');
 					$mailView->setTemplate('maillist');
 					$callView->setTemplate('calllist');
-					$callView->assign('calls', Call::getCallsByLabelID($this->request['labelId']));
+					$callView->assign('calls', Call::getCallsByLabelID($this->request['labelID']));
 					$innerView->setTemplate('label');
-					$innerView->assign('label', Label::getLabelById($this->request['labelId']));
-					$documentView->assign('labelId', $this->request['labelId']);
-					$documentView->assign('documents', Document::getDocumentsByLabelId($this->request['labelId']));
-					$mailView->assign('labelID', $this->request['labelId']);
-					$mailView->assign('mails', Mail::getMailsByLabelID($this->request['labelId']));
+					$innerView->assign('label', Label::getLabelByID($this->request['labelID']));
+					$documentView->assign('labelID', $this->request['labelID']);
+					$documentView->assign('documents', Document::getDocumentsByLabelID($this->request['labelID']));
+					$mailView->assign('labelID', $this->request['labelID']);
+					$mailView->assign('mails', Mail::getMailsByLabelID($this->request['labelID']));
 					$innerView->assign('documentlist', $documentView->loadTemplate());
 					$innerView->assign('maillist', $mailView->loadTemplate());
 					$innerView->assign('calllist', $callView->loadTemplate());
@@ -79,14 +79,14 @@ class Controller {
 					break;
 				case 'manage-label':
 					$innerView->setTemplate('manage-label');
-					$innerView->assign('label', Label::getLabelById($this->request['labelId']));
-					$innerView->assign('mailboxFolders', MailboxFolder::getMailboxFolderByLabelId($this->request['labelId']));
+					$innerView->assign('label', Label::getLabelByID($this->request['labelID']));
+					$innerView->assign('mailboxFolders', MailboxFolder::getMailboxFolderByLabelID($this->request['labelID']));
 					$innerView->assign('user', $user);
 					break;
 				case 'settings':
 					$innerView->setTemplate('settings');
 					$innerView->assign('user', $user);
-					$innerView->assign('mailboxes', Mailbox::getMailboxesByUserId($user->getUserId()));
+					$innerView->assign('mailboxes', Mailbox::getMailboxesByUserID($user->getUserID()));
 					break;
 				case 'default':
 				default:
@@ -100,7 +100,7 @@ class Controller {
 			$this->headerView->assign('title', 'atOfficeWeb');
 			$this->headerView->assign('request', $this->request);
 			$this->headerView->assign('labels', Label::getAllLabels());
-			$this->headerView->assign('userID', $user->getUserId());
+			$this->headerView->assign('userID', $user->getUserID());
 			$this->view->assign('blog_title', $this->headerView->loadTemplate());
 			$this->view->assign('blog_footer', $this->footerView->loadTemplate());
 			$this->view->assign('blog_content', $innerView->loadTemplate());

includes/document.inc.php

@@ -4,22 +4,22 @@ class Document {
     private $id         =   NULL;
     private $fileName   =   NULL;
     private $path       =   NULL;
-    private $labelId    =   NULL;
+    private $labelID    =   NULL;
     private $draft      =   NULL;
     private $created    =   NULL;
     private $lastChange =   NULL;
 
-    public function __construct($id, $fileName, $path, $labelId, $draft, $created, $lastChange) {
+    public function __construct($id, $fileName, $path, $labelID, $draft, $created, $lastChange) {
         $this->id           = $id;
         $this->fileName     = $fileName;
         $this->path         = $path;
-        $this->labelId      = $labelId;
+        $this->labelID      = $labelID;
         $this->draft        = $draft;
         $this->created      = $created;
         $this->lastChange   = $lastChange;
     }
 
-    public function getId() {
+    public function getID() {
         return $this->id;
     }
 
@@ -31,8 +31,8 @@ class Document {
         return $this->path;
     }
 
-    public function getLabelId() {
-        return $this->labelId;
+    public function getLabelID() {
+        return $this->labelID;
     }
 
     public function getDraft() {
@@ -71,17 +71,17 @@ class Document {
      * Get Documents by Label ID
      *
      *
-     * @param int $labelId  Label ID
+     * @param int $labelID  Label ID
      *
      * @return Array(Document)  Array with selected Document(s)
      *
      */
 
-    public static function getDocumentsByLabelId($labelId) {
+    public static function getDocumentsByLabelID($labelID) {
         global $db;
 
         $return = array();
-        $documents = $db->selectQuery("SELECT * FROM `documents` WHERE `label_id` = " . $labelId . ";");
+        $documents = $db->selectQuery("SELECT * FROM `documents` WHERE `label_id` = " . $labelID . ";");
 
         if(!$documents) {
             return false;
@@ -124,7 +124,7 @@ class Document {
      * @param string    $type       Type of Document
      * @param string    $fileName   Name of File/Subject of Mail
      * @param string    $path       Path relative to Label-Home-Folder / Mailaccount
-     * @param int       $labelId    ID of Label
+     * @param int       $labelID    ID of Label
      * @param string    $draft      Name of used draft
      * @param string $created    Date of creation
      * @param string $lastChange Date of last change
@@ -135,10 +135,10 @@ class Document {
      *
      */
 
-    public static function addDocument($type, $fileName, $path, $labelId, $draft, $created, $lastChange) {
+    public static function addDocument($type, $fileName, $path, $labelID, $draft, $created, $lastChange) {
         global $db;
 
-        $query = "INSERT INTO `documents`(`type`, `filename`, `path`, `label_id`, `draft`, `created`, `last_change`) VALUES ('" . $type . "', '" . $fileName . "', '" . $path . "', " . $labelId . ", '" . $draft . "', '" . $created . "', '" . $lastChange . "');";
+        $query = "INSERT INTO `documents`(`type`, `filename`, `path`, `label_id`, `draft`, `created`, `last_change`) VALUES ('" . $type . "', '" . $fileName . "', '" . $path . "', " . $labelID . ", '" . $draft . "', '" . $created . "', '" . $lastChange . "');";
         $db->insertQuery($query);
     }
 

includes/documenthandler.inc.php

@@ -3,7 +3,7 @@ require('includes/PhpWord/Autoloader.php');
 \PhpOffice\PhpWord\Autoloader::register();
 
 class DocumentHandler {
-    private $documentId     = NULL;
+    private $documentID     = NULL;
     private $filename       = "";
     private $documentDraft  = "";
     private $documentHandle = NULL;

includes/functions.inc.php

@@ -39,7 +39,7 @@ function scanDocuments($path) {
 
 
 	$files = recursiveScanDir($path);
-	$allDocuments = getObjectsAsArray(Document::getAllDocuments(), array("id", "fileName", "path", "labelId", "draft", "created", "lastChange", "type", "mailUid"));
+	$allDocuments = getObjectsAsArray(Document::getAllDocuments(), array("id", "fileName", "path", "labelID", "draft", "created", "lastChange", "type", "mailUid"));
 
 	handleFile($files, $allDocuments);
 
@@ -70,7 +70,7 @@ function handleFile($filename, &$allDocuments) {
 		$found = false;
 		foreach($allDocuments as $key => $document) {
 			if($document['fileName'] == explode('/', $filename)[sizeof(explode('/', $filename)) - 1]) {
-				$labelPath = Label::getLabelById($document['labelId'])->getPath();
+				$labelPath = Label::getLabelByID($document['labelID'])->getPath();
 
 
 				if(str_replace($CONFIG['documentPath'], "", $filename) == $labelPath . "/" . $document['path'] . $document['fileName']) {
@@ -97,7 +97,7 @@ function handleFile($filename, &$allDocuments) {
 				$path = "";
 			}
 
-			Document::addDocument('file', explode('/', $filename)[sizeof(explode('/', $filename)) - 1], $path, Label::getLabelByPath($labelPath)->getId(), '', $fileTime, $fileTime);
+			Document::addDocument('file', explode('/', $filename)[sizeof(explode('/', $filename)) - 1], $path, Label::getLabelByPath($labelPath)->getID(), '', $fileTime, $fileTime);
 		}
 	}
 
@@ -121,8 +121,8 @@ function searchMails() {
 				for($i = 1; $i <= $messageCount; ++$i) {
 				    $headers = imap_header($mailbox->getMailbox(), $i);
 
-					if(!Mail::getMailByMailInfo($mbFolder->getId(), $headers->Msgno)) {
-						$mail = new Mail(NULL, imap_utf8($headers->from[0]->mailbox . '@' . $headers->from[0]->host), imap_utf8($headers->subject), $mbFolder->getId(), $headers->Msgno);
+					if(!Mail::getMailByMailInfo($mbFolder->getID(), $headers->Msgno)) {
+						$mail = new Mail(NULL, imap_utf8($headers->from[0]->mailbox . '@' . $headers->from[0]->host), imap_utf8($headers->subject), $mbFolder->getID(), $headers->Msgno);
 
 						$mail->save();
 					}
@@ -133,29 +133,29 @@ function searchMails() {
 }
 
 
-function getEditableLink($elementId, $type, $pk, $title, $value, $class = '') {
+function getEditableLink($elementID, $type, $pk, $title, $value, $class = '') {
 	if($type == 'text' || $type == 'password') {
 		$class = 'editable-element-text';
-	} else if($type == 'select' && $elementId == 'protocol') {
+	} else if($type == 'select' && $elementID == 'protocol') {
 		$class = 'editable-element-select-protocol';
-	} else if($type == 'select' && $elementId == 'use-ssl') {
+	} else if($type == 'select' && $elementID == 'use-ssl') {
 		$class = 'editable-element-select-use-ssl';
 		if($value == '/ssl') {
 			$value = 'On';
 		} else {
 			$value = 'Off';
 		}
-	} else if($type == 'select' && $elementId == 'no-valid-cert') {
+	} else if($type == 'select' && $elementID == 'no-valid-cert') {
 		$class = 'editable-element-select-no-valid-cert';
 		if($value == '/novalidate-cert') {
 			$value = 'On';
 		} else {
 			$value = 'Off';
 		}
-	} else if($type == 'select' && $elementId == 'mailaccount') {
+	} else if($type == 'select' && $elementID == 'mailaccount') {
 		$class = 'editable-element-select-mailaccount';
 	}
-	$link = '<a href="#" id="' . $elementId . '" class="' . $class . '" data-type="' . $type . '" data-pk="' . $pk . '" data-url="ajax.php" data-title="' . $title . '">' . $value . '</a>';
+	$link = '<a href="#" id="' . $elementID . '" class="' . $class . '" data-type="' . $type . '" data-pk="' . $pk . '" data-url="ajax.php" data-title="' . $title . '">' . $value . '</a>';
 	return $link;
 }
 

includes/label.inc.php

@@ -10,7 +10,7 @@ class Label {
         $this->path = $path;
     }
 
-    public function getId() {
+    public function getID() {
         return $this->id;
     }
 
@@ -47,17 +47,17 @@ class Label {
      * Get a Label by ID
      *
      *
-     * @param int $labelId  Label ID
+     * @param int $labelID  Label ID
      *
      * @return Label  Selected Label object
      *
      */
 
-    public static function getLabelById($labelId) {
+    public static function getLabelByID($labelID) {
         global $db;
 
         $return = array();
-        $labels = $db->selectQuery("SELECT * FROM `labels` WHERE `id` = " . $labelId . ";");
+        $labels = $db->selectQuery("SELECT * FROM `labels` WHERE `id` = " . $labelID . ";");
 
         foreach($labels as $label) {
             $return[] = new Label($label->id, $label->name, $label->path);
@@ -149,16 +149,16 @@ class Label {
      /**
      * Remove a Label by Label-ID
      *
-     * @param int $labelId  ID of Label
+     * @param int $labelID  ID of Label
      *
      * @return void
      *
      */
 
-     public static function removeLabel($labelId) {
+     public static function removeLabel($labelID) {
          global $db;
 
-         $db->removeQuery("DELETE FROM `labels` WHERE `id` = " . $labelId . ";");
+         $db->removeQuery("DELETE FROM `labels` WHERE `id` = " . $labelID . ";");
      }
 }
 

includes/mailbox.inc.php

@@ -52,7 +52,7 @@ class Mailbox {
         $this->folders = $newFolders;
     }
 
-    public function getId() {
+    public function getID() {
         return $this->id;
     }
 
@@ -141,18 +141,18 @@ class Mailbox {
      * Get Mailbox by ID
      *
      *
-     * @param int $userId  ID of Mailbox
+     * @param int $userID  ID of Mailbox
      * @param bool $connect Whether to connect or just to store data. Default: false
      *
      * @return Mailbox  Selected Mailboxes
      *
      */
 
-    public static function getMailboxById($mailboxId, $connect = false) {
+    public static function getMailboxByID($mailboxID, $connect = false) {
         global $db;
 
         $return = array();
-        $mailboxes = $db->selectQuery("SELECT * FROM `mailboxes` WHERE `id` = " . $mailboxId . ";");
+        $mailboxes = $db->selectQuery("SELECT * FROM `mailboxes` WHERE `id` = " . $mailboxID . ";");
 
         foreach($mailboxes as $mailbox) {
             $useSsl = '';
@@ -175,17 +175,17 @@ class Mailbox {
      * Get Mailboxes by User ID
      *
      *
-     * @param int $userId  ID of user
+     * @param int $userID  ID of user
      *
      * @return Array(Mailbox)  Array with selected Mailboxes
      *
      */
 
-    public static function getMailboxesByUserId($userId) {
+    public static function getMailboxesByUserID($userID) {
         global $db;
 
         $return = array();
-        $mailboxes = $db->selectQuery("SELECT * FROM `mailboxes` WHERE `user_id` = " . $userId . ";");
+        $mailboxes = $db->selectQuery("SELECT * FROM `mailboxes` WHERE `user_id` = " . $userID . ";");
 
         foreach($mailboxes as $mailbox) {
             $useSsl = '';
@@ -208,16 +208,16 @@ class Mailbox {
      * Get name of Mailbox by MailAccountID
      *
      *
-     * @param int $mId  MailAccount ID
+     * @param int $mID  MailAccount ID
      *
      * @return string  Name of Mailbox
      *
      */
 
-    public static function getMailboxNameFromMailaccountId($mId) {
+    public static function getMailboxNameFromMailaccountID($mID) {
         global $db;
 
-        $mailbox = $db->selectStringQuery("SELECT `username` FROM `mailboxes` WHERE id=" . $mId);
+        $mailbox = $db->selectStringQuery("SELECT `username` FROM `mailboxes` WHERE id=" . $mID);
         return $mailbox;
     }
 

includes/mailboxfolder.inc.php

@@ -3,18 +3,18 @@
 class MailboxFolder {
     private $id         = NULL;
     private $folderName = NULL;
-    private $mailboxId  = NULL;
-    private $labelId    = NULL;
+    private $mailboxID  = NULL;
+    private $labelID    = NULL;
 
-    public function __construct($id, $folderName, $mailboxId, $labelId) {
+    public function __construct($id, $folderName, $mailboxID, $labelID) {
         $this->id = $id;
         $this->folderName = $folderName;
-        $this->mailboxId = $mailboxId;
-        $this->labelId = $labelId;
+        $this->mailboxID = $mailboxID;
+        $this->labelID = $labelID;
 
     }
 
-    public function getId() {
+    public function getID() {
         return $this->id;
     }
 
@@ -22,12 +22,12 @@ class MailboxFolder {
         return $this->folderName;
     }
 
-    public function getMailboxId() {
-        return $this->mailboxId;
+    public function getMailboxID() {
+        return $this->mailboxID;
     }
 
-    public function getLabelId() {
-        return $this->labelId;
+    public function getLabelID() {
+        return $this->labelID;
     }
 
     /**
@@ -88,17 +88,17 @@ class MailboxFolder {
      * Get MailboxFolder by Label ID
      *
      *
-     * @param int $labelId  Label ID
+     * @param int $labelID  Label ID
      *
      * @return Array(MailboxFolder)  Array with selected MailboxFolder(s)
      *
      */
 
-    public static function getMailboxFolderByLabelId($labelId) {
+    public static function getMailboxFolderByLabelID($labelID) {
         global $db;
 
         $return = array();
-        $folders = $db->selectQuery("SELECT * FROM `mailbox-folders` WHERE `label_id` = '" . $labelId . "';");
+        $folders = $db->selectQuery("SELECT * FROM `mailbox-folders` WHERE `label_id` = '" . $labelID . "';");
 
         if(!$folders) {
             return false;
@@ -115,16 +115,16 @@ class MailboxFolder {
      * Get MailboxFolder-Name by ID
      *
      *
-     * @param int $mId  Mailbox-Folder-ID
+     * @param int $mID  Mailbox-Folder-ID
      *
      * @return string  MailboxFolder-Name
      *
      */
 
-    public static function getMailboxFolderNameFromId($mId) {
+    public static function getMailboxFolderNameFromID($mID) {
         global $db;
 
-        $mailbox = $db->selectStringQuery("SELECT `folder_name` FROM `mailbox-folders` WHERE id=" . $mId);
+        $mailbox = $db->selectStringQuery("SELECT `folder_name` FROM `mailbox-folders` WHERE id=" . $mID);
         return $mailbox;
     }
 

includes/model.inc.php

@@ -23,7 +23,7 @@ class Model {
 	/**
 	* Gibt einen bestimmten Eintrag zurück.
 	*
-	* @param int $id Id des gesuchten Eintrags
+	* @param int $id ID des gesuchten Eintrags
 	* @return Array Array, dass einen Eintrag repräsentiert, bzw.
 	* 					wenn dieser nicht vorhanden ist, null.
 	*/

includes/user.inc.php

@@ -3,7 +3,7 @@
 Class User {
 
 	private $username 	= "";
-	private $userId		= NULL;
+	private $userID		= NULL;
 	private $password 	= "";
 	private $email 		= "";
 	private $loggedIn	= false;
@@ -23,12 +23,12 @@ Class User {
 		return $this->loggedIn;
 	}
 
-	public function setUserId($userId) {
-		$this->userId = $userId;
+	public function setUserID($userID) {
+		$this->userID = $userID;
 	}
 
-	public function getUserId() {
-		return $this->userId;
+	public function getUserID() {
+		return $this->userID;
 	}
 
 	public function login($username, $password) {
@@ -71,7 +71,7 @@ Class User {
 		}
 
 		$_SESSION['loggedIn'] = true;
-		$this->userId = $user[0]->id;
+		$this->userID = $user[0]->id;
 		$this->loggedIn = true;
 	}
 

scripts/custom.js

@@ -202,7 +202,7 @@ $(document).ready(function() {
                     $(this).children("td:first").children().remove();
                 }
                 addSpinner($(this).children("td:first"));
-                $.getJSON("ajax.php?action=getMailboxStatus&mailboxId=" + $(this).attr("data-mailbox-id"), function(r) {
+                $.getJSON("ajax.php?action=getMailboxStatus&mailboxID=" + $(this).attr("data-mailbox-id"), function(r) {
                     if(r['connected'] == true) {
                         removeSpinner($(thisTr).children("td:first"));
                         $(thisTr).children("td:first").append("<i class=\"fa fa-check-circle\"></i>");
@@ -231,7 +231,7 @@ $(document).ready(function() {
                 mailboxFolderID: lastOpenedBoxData['mailboxFolderID'],
                 account: $("#editbox-input-account").val(),
                 folder: $("#editbox-input-folder").val(),
-                labelID: getUrlGetParameter("labelId")
+                labelID: getUrlGetParameter("labelID")
             };
 
             $.getJSON("ajax.php?action=saveMailFolder", data, function(r) {
@@ -271,7 +271,7 @@ $(document).ready(function() {
             tRow = $(this).parent().parent();
 
             data = {
-                labelId: $(this).attr("data-id")
+                labelID: $(this).attr("data-id")
             };
 
             $.getJSON("ajax.php?action=removeLabel", data, function(r) {
@@ -299,7 +299,7 @@ $(document).ready(function() {
             data = {
                 draft: $("#editbox-input-vorlage").val(),
                 filename: $("#editbox-input-filename").val(),
-                labelId: getUrlGetParameter("labelId"),
+                labelID: getUrlGetParameter("labelID"),
                 draftVars: {}
             };
 
@@ -489,11 +489,11 @@ $(document).ready(function() {
 
     $('#add-mailaccount').on('click', function(e) {
         e.preventDefault();
-        var uId = $(this).attr('data-uid');
+        var uID = $(this).attr('data-uid');
         $.ajax({
                 url: 'ajax.php',
                 type: 'POST',
-                data: {'action': 'addDefaultMailaccount', 'user-id': uId},
+                data: {'action': 'addDefaultMailaccount', 'user-id': uID},
                 success: function (result) {
                     console.log(result);
                     location.reload();
@@ -504,7 +504,7 @@ $(document).ready(function() {
     function fancyBoxLoader() {
         $.ajax({
             url: 'ajax.php',
-            data: {'action': 'getMailAccountsByUid', 'uId': $('.manage-mailboxfolder').attr('data-uid')},
+            data: {'action': 'getMailAccountsByUid', 'uID': $('.manage-mailboxfolder').attr('data-uid')},
             type: 'GET',
             global: false,
             async: true,
@@ -579,12 +579,12 @@ $(document).ready(function() {
 
     $('#add-mailboxfolder').on('click', function(e) {
         e.preventDefault();
-        var uId = $(this).attr('data-uid');
-        var lId = $(this).attr('data-lid');
+        var uID = $(this).attr('data-uid');
+        var lID = $(this).attr('data-lid');
         $.ajax({
                 url: 'ajax.php',
                 type: 'POST',
-                data: {'action': 'addDefaultMailfolder', 'user-id': uId, 'label-id': lId},
+                data: {'action': 'addDefaultMailfolder', 'user-id': uID, 'label-id': lID},
                 success: function (result) {
                     console.log(result);
                     location.reload();

scripts/jquery.datetimepicker.js

@@ -853,7 +853,7 @@
 						}
 					},
 					setCaretPos = function (node, pos) {
-						node = (typeof node === "string" || node instanceof String) ? document.getElementById(node) : node;
+						node = (typeof node === "string" || node instanceof String) ? document.getElementByID(node) : node;
 						if (!node) {
 							return false;
 						}

templates/header.php

@@ -67,10 +67,10 @@
 			<li class="navbar-label-header<?php if(isset($this->_['request']['action']) && ($this->_['request']['action'] == 'manage-labels' || $this->_['request']['action'] == 'manage-label')) { echo ' active'; } ?>"><a href="?action=manage-labels">Labels</a></li>
 			<?php
 			foreach($this->_['labels'] as $label) {
-				if(isset($this->_['request']['action']) && $this->_['request']['action'] == 'label' && $_REQUEST['labelId'] == $label->getId()) {
-					echo '<li class="active"><a href="?action=label&labelId=' . $label->getId() . '">' . $label->getName() . '</a></li>';
+				if(isset($this->_['request']['action']) && $this->_['request']['action'] == 'label' && $_REQUEST['labelID'] == $label->getID()) {
+					echo '<li class="active"><a href="?action=label&labelID=' . $label->getID() . '">' . $label->getName() . '</a></li>';
 				} else {
-					echo '<li><a href="?action=label&labelId=' . $label->getId() . '">' . $label->getName() . '</a></li>';
+					echo '<li><a href="?action=label&labelID=' . $label->getID() . '">' . $label->getName() . '</a></li>';
 				}
 			}
 

templates/label.php

@@ -24,7 +24,7 @@ foreach($this->_['entries'] as $entry){
                 <li role="presentation"><a href="#calls" aria-controls="settings" role="tab" data-toggle="tab">Calls</a></li>
                 <div class="pull-right">
                     <a id="new-document" href="ajax.php?action=getNewDocumentBox" type="button" class="btn btn-success">Neues Dokument</a>
-                    <a href="ajax.php?action=getNewCallBox&labelID=<?php echo $this->_['label']->getId(); ?>" id="new-call" class="btn btn-primary" role="button">Neuer Anruf</a>
+                    <a href="ajax.php?action=getNewCallBox&labelID=<?php echo $this->_['label']->getID(); ?>" id="new-call" class="btn btn-primary" role="button">Neuer Anruf</a>
                 </div>
 
             </ul>

templates/manage-label.php

@@ -3,7 +3,7 @@
 
     <div class="row">
         <form action="" method="POST">
-            <input type="hidden" name="labelId" value="<?php echo $this->_['label']->getId(); ?>">
+            <input type="hidden" name="labelID" value="<?php echo $this->_['label']->getID(); ?>">
             <div class="form-group">
                 <label for="labelName">Name</label>
                 <input type="text" class="form-control" id="labelName" name="labelName" value="<?php echo $this->_['label']->getName(); ?>">
@@ -22,17 +22,17 @@
                         <?php
                             foreach($this->_['mailboxFolders'] as $mailboxFolder) {
                                 echo '<tr>';
-                                echo '<td>' . $mailboxFolder->getId() . '</td>';
-                                echo '<td>' . Mailbox::getMailboxNameFromMailaccountId($mailboxFolder->getMailboxId()) . '</td>';
+                                echo '<td>' . $mailboxFolder->getID() . '</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>';
+                                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>';
                                 echo '</tr>';
                             }
                         ?>
                     </thead>
                     <tr>
-                        <td><a id="add-mailboxfolder" href="#" data-uid="<?php echo $this->_['user']->getUserId(); ?>" data-lid="<?php echo $this->_['label']->getId(); ?>"><i class="fa fa-plus-circle"></i></a></td>
+                        <td><a id="add-mailboxfolder" href="#" data-uid="<?php echo $this->_['user']->getUserID(); ?>" data-lid="<?php echo $this->_['label']->getID(); ?>"><i class="fa fa-plus-circle"></i></a></td>
                         <td></td>
                         <td></td>
                         <td></td>

templates/manage-labels.php

@@ -14,10 +14,10 @@
             <?php
                 foreach($this->_['labels'] as $label) {
                     echo '<tr>';
-                    echo '<td>' . $label->getId() . '</td>';
+                    echo '<td>' . $label->getID() . '</td>';
                     echo '<td>' . $label->getName() . '</td>';
-                    echo '<td><a href="?action=manage-label&labelId=' . $label->getId() . '"><i class="fa fa-wrench"></i></a></td>';
-                    echo '<td><a href="#" class="remove-label" data-id="' . $label->getId() . '"><i class="fa fa-minus-circle"></i></a></td>';
+                    echo '<td><a href="?action=manage-label&labelID=' . $label->getID() . '"><i class="fa fa-wrench"></i></a></td>';
+                    echo '<td><a href="#" class="remove-label" data-id="' . $label->getID() . '"><i class="fa fa-minus-circle"></i></a></td>';
                     echo '</tr>';
                 }
             ?>

templates/settings.php

@@ -19,16 +19,16 @@
             </thead>
             <?php
             foreach($this->_['mailboxes'] as $mailbox) {
-                echo '<tr data-mailbox-id="' . $mailbox->getId() . '">';
+                echo '<tr data-mailbox-id="' . $mailbox->getID() . '">';
                 echo '<td></td>';
-                echo '<td>' . getEditableLink('hostname', 'text', $mailbox->getId(), 'Click to edit', $mailbox->getHostname()) . '</td>';
-                echo '<td>' . getEditableLink('port', 'text', $mailbox->getId(), 'Click to edit', $mailbox->getPort()) . '</td>';
-                echo '<td>' . getEditableLink('protocol', 'select', $mailbox->getId(), 'Click to edit', $mailbox->getProtocol()) . '</td>';
-                echo '<td>' . getEditableLink('use-ssl', 'select', $mailbox->getId(), 'Click to edit', $mailbox->getUseSsl()) . '</td>';
-                echo '<td>' . getEditableLink('no-valid-cert', 'select', $mailbox->getId(), 'Click to edit', $mailbox->getNoValidCert()) . '</td>';
-                echo '<td>' . getEditableLink('username', 'text', $mailbox->getId(), 'Click to edit', $mailbox->getUsername()) . '</td>';
-                echo '<td>' . getEditableLink('password', 'password', $mailbox->getId(), 'Click to edit', 'Click to change') . '</td>';
-                echo '<td><a class="remove-mailaccount" href="#" data-id="' . $mailbox->getId() . '"><i class="fa fa-minus-circle"></i></a></td>';
+                echo '<td>' . getEditableLink('hostname', 'text', $mailbox->getID(), 'Click to edit', $mailbox->getHostname()) . '</td>';
+                echo '<td>' . getEditableLink('port', 'text', $mailbox->getID(), 'Click to edit', $mailbox->getPort()) . '</td>';
+                echo '<td>' . getEditableLink('protocol', 'select', $mailbox->getID(), 'Click to edit', $mailbox->getProtocol()) . '</td>';
+                echo '<td>' . getEditableLink('use-ssl', 'select', $mailbox->getID(), 'Click to edit', $mailbox->getUseSsl()) . '</td>';
+                echo '<td>' . getEditableLink('no-valid-cert', 'select', $mailbox->getID(), 'Click to edit', $mailbox->getNoValidCert()) . '</td>';
+                echo '<td>' . getEditableLink('username', 'text', $mailbox->getID(), 'Click to edit', $mailbox->getUsername()) . '</td>';
+                echo '<td>' . getEditableLink('password', 'password', $mailbox->getID(), 'Click to edit', 'Click to change') . '</td>';
+                echo '<td><a class="remove-mailaccount" href="#" data-id="' . $mailbox->getID() . '"><i class="fa fa-minus-circle"></i></a></td>';
                 echo '</tr>';
             }
             ?>
@@ -41,7 +41,7 @@
                 <td></td>
                 <td></td>
                 <td></td>
-                <td><a id="add-mailaccount" href="#" data-uid="<?php echo $this->_['user']->getUserId(); ?>"><i class="fa fa-plus-circle"></i></a></td>
+                <td><a id="add-mailaccount" href="#" data-uid="<?php echo $this->_['user']->getUserID(); ?>"><i class="fa fa-plus-circle"></i></a></td>
             </tr>
         </table>
     </div>