ZP-900 Updated some missed function and variable names. Fixed typos.

Released under the Affero GNU General Public License (AGPL) version 3.

src/backend/zarafa/zarafa.php

@@ -418,7 +418,6 @@ class BackendZarafa implements IBackend, ISearchProvider {
             return false;
         }
 
-        // delayed logging to log to potentially log the parameters set for ZO-6
         ZLog::Write(LOGLEVEL_DEBUG, sprintf("ZarafaBackend->SendMail(): RFC822: %d bytes  forward-id: '%s' reply-id: '%s' parent-id: '%s' SaveInSent: '%s' ReplaceMIME: '%s'",
                                             strlen($sm->mime), Utils::PrintAsString($sm->forwardflag), Utils::PrintAsString($sm->replyflag),
                                             Utils::PrintAsString((isset($sm->source->folderid) ? $sm->source->folderid : false)),

src/lib/core/asdevice.php

@@ -72,9 +72,9 @@ class ASDevice extends StateObject {
                                     'announcedASversion' => false,
                                     'foldersynccomplete' => true,
                                     'additionalfolders' => array(),
-                                    'olpluginversion' => false,
-                                    'olpluginbuild' => false,
-                                    'olpluginbuilddate' => false,
+                                    'koeversion' => false,
+                                    'koebuild' => false,
+                                    'koebuilddate' => false,
                                     'koegabbackendfolderid' => false,
                                 );
 

src/lib/core/devicemanager.php

@@ -157,9 +157,9 @@ class DeviceManager {
 
         // update data from the OL plugin (if available)
         if (Request::HasKoeStats()) {
-            $this->device->SetOLPluginVersion(Request::GetKoeVersion());
-            $this->device->SetOLPluginBuild(Request::GetKoeBuild());
-            $this->device->SetOLPluginBuildDate(Request::GetKoeBuildDate());
+            $this->device->SetKoeVersion(Request::GetKoeVersion());
+            $this->device->SetKoeBuild(Request::GetKoeBuild());
+            $this->device->SetKoeBuildDate(Request::GetKoeBuildDate());
         }
 
         // data to be saved

src/lib/syncobjects/syncnote.php

@@ -47,7 +47,7 @@
 
 
 class SyncNote extends SyncObject {
-    // KOE transports note colors as categories
+    // Outlook transports note colors as categories
     static private $colors = array(
             0 => "Blue Category",
             1 => "Green Category",

tools/gab-sync/config.php

@@ -49,11 +49,11 @@ define('AMOUNT_OF_CHUNKS', 10);
 // SyncWorker implementation to be used
 define('SYNCWORKER', 'Kopano');
 
-// unique id to find a contact from the GAB (value to be supplied by -u on the command line)
+// Unique id to find a contact from the GAB (value to be supplied by -u on the command line)
 // Zarafa supports: 'account' and 'smtpAddress' (email)
 define('UNIQUEID', 'account');
 
-// server connection settings
+// Server connection settings
 // Depending on your setup, it might be advisable to change the lines below to one defined with your
 // default socket location.
 // Normally "default:" points to the default setting ("file:///var/run/kopano/server.sock")

tools/gab-sync/gab-sync.php

@@ -90,10 +90,10 @@ class GabSyncCLI {
     static private $errormessage;
 
     /**
-     * Returns usage instructions
+     * Returns usage instructions.
      *
-     * @return string
      * @access public
+     * @return string
      */
     static public function UsageInstructions() {
         return  "Usage:" .PHP_EOL.
@@ -112,6 +112,9 @@ class GabSyncCLI {
 
     /**
      * Setup of the SyncWorker implementation.
+     *
+     * @access public
+     * @return boolean
      */
     static public function SetupSyncWorker() {
         $file = "lib/" .strtolower(SYNCWORKER).".php";
@@ -136,10 +139,10 @@ class GabSyncCLI {
     }
 
     /**
-     * Checks the environment
+     * Checks the environment.
      *
-     * @return
      * @access public
+     * @return void
      */
     static public function CheckEnv() {
         if (php_sapi_name() != "cli")
@@ -150,10 +153,10 @@ class GabSyncCLI {
     }
 
     /**
-     * Checks the options from the command line
+     * Checks the options from the command line.
      *
-     * @return
      * @access public
+     * @return void
      */
     static public function CheckOptions() {
         if (self::$errormessage)
@@ -213,30 +216,30 @@ class GabSyncCLI {
 
     /**
      * Indicates if the options from the command line
-     * could be processed correctly
+     * could be processed correctly.
      *
-     * @return boolean
      * @access public
+     * @return boolean
      */
     static public function SureWhatToDo() {
         return isset(self::$command);
     }
 
     /**
-     * Returns a errormessage of things which could have gone wrong
+     * Returns a errormessage of things which could have gone wrong.
      *
-     * @return string
      * @access public
+     * @return string
      */
     static public function GetErrorMessage() {
         return (isset(self::$errormessage))?self::$errormessage:"";
     }
 
     /**
-     * Runs a command requested from an action of the command line
+     * Runs a command requested from an action of the command line.
      *
-     * @return
      * @access public
+     * @return void
      */
     static public function RunCommand() {
         echo PHP_EOL;

tools/gab-sync/lib/kopano.php

@@ -140,7 +140,7 @@ class Kopano extends SyncWorker {
     }
 
     /**
-     * Returns the internal identfier (folder-id) of the hidden folder.
+     * Returns the internal identifier (folder-id) of the hidden folder.
      *
      * @access protected
      * @return string|boolean on error
@@ -447,6 +447,8 @@ class Kopano extends SyncWorker {
      *
      * @param string $folderid
      * @param string $chunkName
+     *
+     * @access private
      * @return array
      */
     private function findChunk($folderid, $chunkName) {
@@ -467,12 +469,12 @@ class Kopano extends SyncWorker {
     }
 
     /**
-     * Open the store marked with PR_DEFAULT_STORE = TRUE
-     * if $return_public is set, the public store is opened
+     * Open the store marked with PR_DEFAULT_STORE = TRUE.
+     * If $return_public is set, the public store is opened.
      *
      * @param string    $user   User which store should be opened
      *
-     * @access public
+     * @access private
      * @return boolean
      */
     private function openMessageStore($user) {
@@ -556,7 +558,7 @@ class Kopano extends SyncWorker {
     }
 
     /**
-     * Opens the a folder.
+     * Opens a folder.
      *
      * @param string $folderid
      * @access private

tools/gab-sync/lib/syncworker.php

@@ -48,7 +48,7 @@ abstract class SyncWorker {
     private $hashFieldId;
 
     /**
-     * The constructer should do all required login actions.
+     * The constructor should do all required login actions.
      */
     public function __construct() {
         $this->chunkType = @constant("HASHFIELD") . "-" . @constant("AMOUNT_OF_CHUNKS");
@@ -57,6 +57,9 @@ abstract class SyncWorker {
 
     /**
      * Simulates the synchronization, showing statistics but without touching any data.
+     *
+     * @access public
+     * @return void
      */
     public function Simulate() {
         $this->Log("Simulating the synchronization. NO DATA IS GOING TO BE WRITTEN.".PHP_EOL);
@@ -324,7 +327,8 @@ abstract class SyncWorker {
     /**
      * Calculated the chunk-id of a value.
      *
-     * @parem string $value
+     * @param string $value
+     *
      * @access protected
      * @return number
      */
@@ -357,7 +361,7 @@ abstract class SyncWorker {
     protected abstract function DeleteHiddenFolder($folderid);
 
     /**
-     * Returns the internal identfier (folder-id) of the hidden folder.
+     * Returns the internal identifier (folder-id) of the hidden folder.
      *
      * @access protected
      * @return string