diff --git a/app/Http/Controllers/Agent/helpdesk/CannedController.php b/app/Http/Controllers/Agent/helpdesk/CannedController.php index 771a426a5..f2924280e 100644 --- a/app/Http/Controllers/Agent/helpdesk/CannedController.php +++ b/app/Http/Controllers/Agent/helpdesk/CannedController.php @@ -15,7 +15,7 @@ use Exception; /** * CannedController. - * + * * This controller is for all the functionalities of Canned response for Agents in the Agent Panel * * @author Ladybird diff --git a/app/Http/Controllers/Agent/helpdesk/DashboardController.php b/app/Http/Controllers/Agent/helpdesk/DashboardController.php index 4a09419d2..55a95c3ff 100644 --- a/app/Http/Controllers/Agent/helpdesk/DashboardController.php +++ b/app/Http/Controllers/Agent/helpdesk/DashboardController.php @@ -15,7 +15,7 @@ use View; /** * DashboardController * This controlleris used to fetch dashboard in the agent panel. - * + * * @author Ladybird */ class DashboardController extends Controller diff --git a/app/Http/Controllers/Agent/helpdesk/NotificationController.php b/app/Http/Controllers/Agent/helpdesk/NotificationController.php index 37aea1162..31ea59f8b 100644 --- a/app/Http/Controllers/Agent/helpdesk/NotificationController.php +++ b/app/Http/Controllers/Agent/helpdesk/NotificationController.php @@ -11,6 +11,7 @@ use App\Model\helpdesk\Settings\Company; use App\Model\helpdesk\settings\Email; use App\Model\helpdesk\Utility\Log_notification; use App\User; + // classes /** diff --git a/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php b/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php index 61b2848c7..a61916d0d 100644 --- a/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php +++ b/app/Http/Controllers/Agent/helpdesk/Ticket2Controller.php @@ -3,7 +3,8 @@ namespace App\Http\Controllers\Agent\helpdesk; // controllers -use App\Http\Controllers\Common\SettingsController;use App\Http\Controllers\Controller; +use App\Http\Controllers\Common\SettingsController; +use App\Http\Controllers\Controller; // requests // models use App\Model\helpdesk\Agent\Department; diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 0c900ef4f..9727d369f 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -2533,7 +2533,7 @@ class TicketController extends Controller } } - /** + /** * useradd. * * @param type Image $image diff --git a/app/Http/Controllers/Agent/kb/ArticleController.php b/app/Http/Controllers/Agent/kb/ArticleController.php index 337bbe430..2a99cb213 100644 --- a/app/Http/Controllers/Agent/kb/ArticleController.php +++ b/app/Http/Controllers/Agent/kb/ArticleController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Agent\kb; // Controllers use App\Http\Controllers\Agent\helpdesk\TicketController; - use App\Http\Controllers\Controller; // Requests use App\Http\Requests\kb\ArticleRequest; diff --git a/app/Http/Controllers/Api/v1/ApiController.php b/app/Http/Controllers/Api/v1/ApiController.php index 259f03cd6..7e5b57027 100644 --- a/app/Http/Controllers/Api/v1/ApiController.php +++ b/app/Http/Controllers/Api/v1/ApiController.php @@ -23,8 +23,8 @@ use Illuminate\Http\Request; * ----------------------------------------------------------------------------- * Api Controller * -----------------------------------------------------------------------------. - * - * + * + * * @author Vijay Sebastian * @copyright (c) 2016, Ladybird Web Solution * @name Faveo HELPDESK @@ -723,7 +723,7 @@ class ApiController extends Controller /** * To generate api string. - * + * * @return type | json */ public function generateApiKey() diff --git a/app/Http/Controllers/Api/v1/TicketController.php b/app/Http/Controllers/Api/v1/TicketController.php index 12856fa89..079da83f7 100644 --- a/app/Http/Controllers/Api/v1/TicketController.php +++ b/app/Http/Controllers/Api/v1/TicketController.php @@ -22,8 +22,8 @@ use Mail; * ----------------------------------------------------------------------------- * Ticket Controller * -----------------------------------------------------------------------------. - * - * + * + * * @author Vijay Sebastian * @copyright (c) 2016, Ladybird Web Solution * @name Faveo HELPDESK diff --git a/app/Http/Controllers/Api/v1/TokenAuthController.php b/app/Http/Controllers/Api/v1/TokenAuthController.php index 4d05a7ee5..94c3d0983 100644 --- a/app/Http/Controllers/Api/v1/TokenAuthController.php +++ b/app/Http/Controllers/Api/v1/TokenAuthController.php @@ -13,8 +13,8 @@ use Tymon\JWTAuth\Exceptions\JWTException; * ----------------------------------------------------------------------------- * Token authenticate Controller * -----------------------------------------------------------------------------. - * - * + * + * * @author Vijay Sebastian * @copyright (c) 2016, Ladybird Web Solution * @name Faveo HELPDESK diff --git a/app/Http/Controllers/Client/helpdesk/EmailController.php b/app/Http/Controllers/Client/helpdesk/EmailController.php index 577b036ff..ef1687bbd 100644 --- a/app/Http/Controllers/Client/helpdesk/EmailController.php +++ b/app/Http/Controllers/Client/helpdesk/EmailController.php @@ -6,6 +6,7 @@ namespace App\Http\Controllers\Client\helpdesk; use App\Http\Controllers\Controller; // models use App\Model\helpdesk\Email\Emails; + // classes /** diff --git a/app/Http/Controllers/Installer/helpdesk/InstallController.php b/app/Http/Controllers/Installer/helpdesk/InstallController.php index bfd12034b..2e52c9bd0 100644 --- a/app/Http/Controllers/Installer/helpdesk/InstallController.php +++ b/app/Http/Controllers/Installer/helpdesk/InstallController.php @@ -71,7 +71,7 @@ class InstallController extends Controller /** * Get prerequisites (step 2). - * + * * Checking the extensions enabled required for installing the faveo * without which the project cannot be executed properly * diff --git a/app/Model/helpdesk/Ticket/Ticket_Thread.php b/app/Model/helpdesk/Ticket/Ticket_Thread.php index 6d694575c..59eb85287 100644 --- a/app/Model/helpdesk/Ticket/Ticket_Thread.php +++ b/app/Model/helpdesk/Ticket/Ticket_Thread.php @@ -3,6 +3,7 @@ namespace App\Model\helpdesk\Ticket; use Illuminate\Database\Eloquent\Model; + class Ticket_Thread extends Model { protected $table = 'ticket_thread'; diff --git a/app/Model/helpdesk/Ticket/Tickets.php b/app/Model/helpdesk/Ticket/Tickets.php index 445dfffad..423f90642 100644 --- a/app/Model/helpdesk/Ticket/Tickets.php +++ b/app/Model/helpdesk/Ticket/Tickets.php @@ -3,6 +3,7 @@ namespace App\Model\helpdesk\Ticket; use Illuminate\Database\Eloquent\Model; + class Tickets extends Model { protected $table = 'tickets'; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 0c82934b5..29ca67dc7 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -36,7 +36,7 @@ class AppServiceProvider extends ServiceProvider \Cron::add('example2', '*/2 * * * *', function () { // Do some crazy things successfully every two minute - return; + }); \Cron::add('disabled job', '0 * * * *', function () { diff --git a/config/app.php b/config/app.php index 782c7563f..47f5db3a0 100644 --- a/config/app.php +++ b/config/app.php @@ -20,9 +20,9 @@ return [ | Error Log |-------------------------------------------------------------------------- | - | This error log will send email to faveo about the errors. So that before - | reporting about the errors we at faveo will start solving the issues already. - | The errors mails will never share your files or data. it will only share + | This error log will send email to faveo about the errors. So that before + | reporting about the errors we at faveo will start solving the issues already. + | The errors mails will never share your files or data. it will only share | the line number and error occured. | To dissable you may just change '%1%' to 0. */ diff --git a/public/ckeditor/samples/old/sample_posteddata.php b/public/ckeditor/samples/old/sample_posteddata.php index c66bc68a2..87e6f1f7c 100644 --- a/public/ckeditor/samples/old/sample_posteddata.php +++ b/public/ckeditor/samples/old/sample_posteddata.php @@ -1,4 +1,5 @@ -
+
 
 -------------------------------------------------------------------------------------------
   CKEditor - Posted Data
diff --git a/public/filemanager/connectors/php/default.config.php b/public/filemanager/connectors/php/default.config.php
index 483a0c883..1590fa831 100644
--- a/public/filemanager/connectors/php/default.config.php
+++ b/public/filemanager/connectors/php/default.config.php
@@ -1,9 +1,9 @@
 check()) {
 
 /**
  *  Check if user is authorized.
- *  
+ *
  *
  *  @return bool true if access granted, false if no access
  */
diff --git a/public/filemanager/connectors/php/filemanager.class.php b/public/filemanager/connectors/php/filemanager.class.php
index f532e5fac..4072164e0 100644
--- a/public/filemanager/connectors/php/filemanager.class.php
+++ b/public/filemanager/connectors/php/filemanager.class.php
@@ -1213,8 +1213,6 @@ private function is_valid_path($path)
         if ($deleteRootToo) {
             @rmdir($dir);
         }
-
-        return;
     }
 
 /**
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demo_screen.php b/public/filemanager/connectors/php/inc/wideimage/demo/demo_screen.php
index e4f810bb5..7f0ee2bff 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demo_screen.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demo_screen.php
@@ -1,6 +1,5 @@
 
 

 	
diff --git a/public/filemanager/connectors/php/inc/wideimage/demo/demos/addNoise.php b/public/filemanager/connectors/php/inc/wideimage/demo/demos/addNoise.php
index d75512842..aa5d98f99 100644
--- a/public/filemanager/connectors/php/inc/wideimage/demo/demos/addNoise.php
+++ b/public/filemanager/connectors/php/inc/wideimage/demo/demos/addNoise.php
@@ -1,6 +1,5 @@
 
          * $img = WideImage::load('pic.jpg');
@@ -110,7 +101,7 @@
          * $canvas->useFont('Verdana.ttf', 16, $img->allocateColor(255, 0, 0));
          * $canvas->writeText('right', 'bottom', 'www.website.com');
          * 
-         * 
+         *
          * @param int    $x     Left
          * @param int    $y     Top
          * @param string $text  Text to write
@@ -133,9 +124,9 @@
 
         /**
          * A magic method that allows you to call any PHP function that starts with "image".
-         * 
+         *
          * This is a shortcut to call custom functions on the image handle.
-         * 
+         *
          * Example:
          * 
          * $img = WideImage::load('pic.jpg');
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php b/public/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php
index 7b3a14360..b6b615055 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Coordinate.php
@@ -3,9 +3,6 @@
      * @author Gasper Kozak
      * @copyright 2007-2011
      **/
-
-    /**
-     */
     class WideImage_InvalidCoordinateException extends WideImage_Exception
     {
     }
@@ -20,7 +17,7 @@
 
         /**
          * Parses a numeric or string representation of a corrdinate into a structure.
-         * 
+         *
          * @param string $coord Smart coordinate
          *
          * @return array Parsed smart coordinate
@@ -71,7 +68,7 @@
 
         /**
          * Evaluates the $coord relatively to $dim.
-         * 
+         *
          * @param string $coord   A numeric value or percent string
          * @param int    $dim     Dimension
          * @param int    $sec_dim Secondary dimension (for align)
@@ -130,7 +127,7 @@
 
         /**
          * Calculates and fixes a smart coordinate into a numeric value.
-         * 
+         *
          * @param mixed $value   Smart coordinate, relative to $dim
          * @param int   $dim     Coordinate to which $value is relative
          * @param int   $sec_dim Secondary dimension (for align)
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php b/public/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php
index 8501ec379..53e08686c 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Font/TTF.php
@@ -22,7 +22,7 @@
 
         /**
          * Writes text onto an image.
-         * 
+         *
          * @param WideImage_Image $image
          * @param mixed           $x     smart coordinate
          * @param mixed           $y     smart coordinate
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Image.php b/public/filemanager/connectors/php/inc/wideimage/lib/Image.php
index d0617bc31..875e23aff 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Image.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Image.php
@@ -62,7 +62,7 @@
 
         /**
          * Cleanup.
-         * 
+         *
          * Destroys the handle via WideImage_Image::destroy() when called by the GC.
          */
         public function __destruct()
@@ -72,7 +72,7 @@
 
         /**
          * This method destroy the image handle, and releases the image resource.
-         * 
+         *
          * After this is called, the object doesn't hold a valid image any more.
          * No operation should be called after that.
          */
@@ -87,7 +87,7 @@
 
         /**
          * Returns the GD image resource.
-         * 
+         *
          * @return resource GD image resource
          */
         public function getHandle()
@@ -113,29 +113,29 @@
 
         /**
          * Saves an image to a file.
-         * 
+         *
          * The file type is recognized from the $uri. If you save to a GIF8, truecolor images
          * are automatically converted to palette.
-         * 
-         * This method supports additional parameters: quality (for jpeg images) and 
+         *
+         * This method supports additional parameters: quality (for jpeg images) and
          * compression quality and filters (for png images). See http://www.php.net/imagejpeg and
          * http://www.php.net/imagepng for details.
-         * 
+         *
          * Examples:
          * 
          * // save to a GIF
          * $image->saveToFile('image.gif');
-         * 
+         *
          * // save to a PNG with compression=7 and no filters
          * $image->saveToFile('image.png', 7, PNG_NO_FILTER);
-         * 
+         *
          * // save to a JPEG with quality=80
          * $image->saveToFile('image.jpg', 80);
-         * 
+         *
          * // save to a JPEG with default quality=100
          * $image->saveToFile('image.jpg');
          * 
-         * 
+         *
          * @param string $uri File location
          */
         public function saveToFile($uri)
@@ -151,9 +151,9 @@
 
         /**
          * Returns binary string with image data in format specified by $format.
-         * 
+         *
          * Additional parameters may be passed to the function. See WideImage_Image::saveToFile() for more details.
-         * 
+         *
          * @param string $format The format of the image
          *
          * @return string The binary image data in specified format
@@ -176,7 +176,7 @@
 
         /**
          * Output a header to browser.
-         * 
+         *
          * @param $name Name of the header
          * @param $data Data
          */
@@ -187,15 +187,15 @@
 
         /**
          * Outputs the image to browser.
-         * 
+         *
          * Sets headers Content-length and Content-type, and echoes the image in the specified format.
-         * All other headers (such as Content-disposition) must be added manually. 
-         * 
+         * All other headers (such as Content-disposition) must be added manually.
+         *
          * Example:
          * 
          * WideImage::load('image1.png')->resize(100, 100)->output('gif');
          * 
-         * 
+         *
          * @param string $format Image format
          */
         public function output($format)
@@ -226,7 +226,7 @@
 
         /**
          * Allocate a color by RGB values.
-         * 
+         *
          * @param mixed $R Red-component value or an RGB array (with red, green, blue keys)
          * @param int   $G If $R is int, this is the green component
          * @param int   $B If $R is int, this is the blue component
@@ -260,7 +260,7 @@
 
         /**
          * Sets the current transparent color index. Only makes sense for palette images (8-bit).
-         * 
+         *
          * @param int $color Transparent color index
          */
         public function setTransparentColor($color)
@@ -270,7 +270,7 @@
 
         /**
          * Returns a RGB array of the transparent color or null if none.
-         * 
+         *
          * @return mixed Transparent color RGBA array
          */
         public function getTransparentColorRGB()
@@ -287,11 +287,11 @@
 
         /**
          * Returns a RGBA array for pixel at $x, $y.
-         * 
+         *
          * @param int $x
          * @param int $y
          *
-         * @return array RGB array 
+         * @return array RGB array
          */
         public function getRGBAt($x, $y)
         {
@@ -300,7 +300,7 @@
 
         /**
          * Writes a pixel at the designated coordinates.
-         * 
+         *
          * Takes an associative array of colours and uses getExactColor() to
          * retrieve the exact index color to write to the image with.
          *
@@ -315,7 +315,7 @@
 
         /**
          * Returns a color's RGB.
-         * 
+         *
          * @param int $colorIndex Color index
          *
          * @return mixed RGBA array for a color with index $colorIndex
@@ -327,7 +327,7 @@
 
         /**
          * Returns an index of the color at $x, $y.
-         * 
+         *
          * @param int $x
          * @param int $y
          *
@@ -340,7 +340,7 @@
 
         /**
          * Set the color index $color to a pixel at $x, $y.
-         * 
+         *
          * @param int $x
          * @param int $y
          * @param int $color Color index
@@ -353,7 +353,7 @@
         /**
          * Returns closest color index that matches the given RGB value. Uses
          * PHP's imagecolorclosest().
-         * 
+         *
          * @param mixed $R Red or RGBA array
          * @param int   $G Green component (or null if $R is an RGB array)
          * @param int   $B Blue component (or null if $R is an RGB array)
@@ -372,7 +372,7 @@
         /**
          * Returns the color index that exactly matches the given RGB value. Uses
          * PHP's imagecolorexact().
-         * 
+         *
          * @param mixed $R Red or RGBA array
          * @param int   $G Green component (or null if $R is an RGB array)
          * @param int   $B Blue component (or null if $R is an RGB array)
@@ -391,7 +391,7 @@
         /**
          * Copies transparency information from $sourceImage. Optionally fills
          * the image with the transparent color at (0, 0).
-         * 
+         *
          * @param object $sourceImage
          * @param bool   $fill        True if you want to fill the image with transparent color
          */
@@ -419,7 +419,7 @@
 
         /**
          * Fill the image at ($x, $y) with color index $color.
-         * 
+         *
          * @param int $x
          * @param int $y
          * @param int $color
@@ -443,13 +443,13 @@
 
         /**
          * Returns the image's mask.
-         * 
+         *
          * Mask is a greyscale image where the shade defines the alpha channel (black = transparent, white = opaque).
-         * 
-         * For opaque images (JPEG), the result will be white. For images with single-color transparency (GIF, 8-bit PNG), 
-         * the areas with the transparent color will be black. For images with alpha channel transparenct, 
+         *
+         * For opaque images (JPEG), the result will be white. For images with single-color transparency (GIF, 8-bit PNG),
+         * the areas with the transparent color will be black. For images with alpha channel transparenct,
          * the result will be alpha channel.
-         * 
+         *
          * @return WideImage_Image An image mask
          **/
         public function getMask()
@@ -459,23 +459,23 @@
 
         /**
          * Resize the image to given dimensions.
-         * 
+         *
          * $width and $height are both smart coordinates. This means that you can pass any of these values in:
          *   - positive or negative integer (100, -20, ...)
          *   - positive or negative percent string (30%, -15%, ...)
          *   - complex coordinate (50% - 20, 15 + 30%, ...)
-         * 
+         *
          * If $width is null, it's calculated proportionally from $height, and vice versa.
-         * 
+         *
          * Example (resize to half-size):
          * 
          * $smaller = $image->resize('50%');
-         * 
+         *
          * $smaller = $image->resize('100', '100', 'inside', 'down');
          * is the same as
          * $smaller = $image->resizeDown(100, 100, 'inside');
          * 
-         * 
+         *
          * @param mixed  $width  The new width (smart coordinate), or null.
          * @param mixed  $height The new height (smart coordinate), or null.
          * @param string $fit    'inside', 'outside', 'fill'
@@ -491,7 +491,7 @@
         /**
          * Same as WideImage_Image::resize(), but the image is only applied if it is larger then the given dimensions.
          * Otherwise, the resulting image retains the source's dimensions.
-         * 
+         *
          * @param int    $width  New width, smart coordinate
          * @param int    $height New height, smart coordinate
          * @param string $fit    'inside', 'outside', 'fill'
@@ -506,7 +506,7 @@
         /**
          * Same as WideImage_Image::resize(), but the image is only applied if it is smaller then the given dimensions.
          * Otherwise, the resulting image retains the source's dimensions.
-         * 
+         *
          * @param int    $width  New width, smart coordinate
          * @param int    $height New height, smart coordinate
          * @param string $fit    'inside', 'outside', 'fill'
@@ -520,9 +520,9 @@
 
         /**
          * Rotate the image for angle $angle clockwise.
-         * 
+         *
          * Preserves transparency. Has issues when saving to a BMP.
-         * 
+         *
          * @param int  $angle             Angle in degrees, clock-wise
          * @param int  $bgColor           color of the new background
          * @param bool $ignoreTransparent
@@ -536,9 +536,9 @@
 
         /**
          * This method lays the overlay (watermark) on the image.
-         * 
+         *
          * Hint: if the overlay is a truecolor image with alpha channel, you should leave $pct at 100.
-         * 
+         *
          * This operation supports alignment notation in coordinates:
          * 
          * $watermark = WideImage::load('logo.gif');
@@ -546,7 +546,7 @@
          * $result = $base->merge($watermark, "right - 10", "bottom - 10", 50);
          * // applies a logo aligned to bottom-right corner with a 10 pixel margin
          * 
-         * 
+         *
          * @param WideImage_Image $overlay The overlay image
          * @param mixed           $left    Left position of the overlay, smart coordinate
          * @param mixed           $top     Top position of the overlay, smart coordinate
@@ -561,31 +561,31 @@
 
         /**
          * Resizes the canvas of the image, but doesn't scale the content of the image.
-         * 
-         * This operation creates an empty canvas with dimensions $width x $height, filled with 
+         *
+         * This operation creates an empty canvas with dimensions $width x $height, filled with
          * background color $bg_color and draws the original image onto it at position [$pos_x, $pos_y].
-         * 
-         * Arguments $width, $height, $pos_x and $pos_y are all smart coordinates. $width and $height are 
+         *
+         * Arguments $width, $height, $pos_x and $pos_y are all smart coordinates. $width and $height are
          * relative to the current image size, $pos_x and $pos_y are relative to the newly calculated
          * canvas size. This can be confusing, but it makes sense. See the example below.
-         * 
-         * The example below loads a 100x150 image and then resizes its canvas to 200% x 100%+20 
+         *
+         * The example below loads a 100x150 image and then resizes its canvas to 200% x 100%+20
          * (which evaluates to 200x170). The image is placed at position [10, center+20], which evaluates to [10, 30].
          * 
          * $image = WideImage::load('someimage.jpg'); // 100x150
          * $white = $image->allocateColor(255, 255, 255);
          * $image->resizeCanvas('200%', '100% + 20', 10, 'center+20', $white);
          * 
-         * 
+         *
          * The parameter $merge defines whether the original image should be merged onto the new canvas.
          * This means it blends transparent color and alpha colors into the background color. If set to false,
          * the original image is just copied over, preserving the transparency/alpha information.
-         * 
-         * You can set the $scale parameter to limit when to resize the canvas. For example, if you want 
-         * to resize the canvas only if the image is smaller than the new size, but leave the image intact 
-         * if it's larger, set it to 'up'. Likewise, if you want to shrink the canvas, but don't want to 
-         * change images that are already smaller, set it to 'down'. 
-         * 
+         *
+         * You can set the $scale parameter to limit when to resize the canvas. For example, if you want
+         * to resize the canvas only if the image is smaller than the new size, but leave the image intact
+         * if it's larger, set it to 'up'. Likewise, if you want to shrink the canvas, but don't want to
+         * change images that are already smaller, set it to 'down'.
+         *
          * @param mixed  $width    Width of the new canvas (smart coordinate, relative to current image width)
          * @param mixed  $height   Height of the new canvas (smart coordinate, relative to current image height)
          * @param mixed  $pos_x    x-position of the image (smart coordinate, relative to the new width)
@@ -603,31 +603,31 @@
 
         /**
          * Returns an image with round corners.
-         * 
+         *
          * You can either set the corners' color or set them transparent.
-         * 
+         *
          * Note on $smoothness: 1 means jagged edges, 2 is much better, more than 4 doesn't noticeably improve the quality.
          * Rendering becomes increasingly slower if you increase smoothness.
-         * 
+         *
          * Example:
          * 
          * $nice = $ugly->roundCorners(20, $ugly->allocateColor(255, 0, 0), 2);
          * 
-         * 
+         *
          * Use $corners parameter to specify which corners to draw rounded. Possible values are
          * WideImage::SIDE_TOP_LEFT, WideImage::SIDE_TOP,
          * WideImage::SIDE_TOP_RIGHT, WideImage::SIDE_RIGHT,
-         * WideImage::SIDE_BOTTOM_RIGHT, WideImage::SIDE_BOTTOM, 
+         * WideImage::SIDE_BOTTOM_RIGHT, WideImage::SIDE_BOTTOM,
          * WideImage::SIDE_BOTTOM_LEFT, WideImage::SIDE_LEFT, and WideImage::SIDE_ALL.
          * You can specify any combination of corners with a + operation, see example below.
-         * 
+         *
          * Example:
          * 
          * $white = $image->allocateColor(255, 255, 255);
          * $diagonal_corners = $image->roundCorners(15, $white, 2, WideImage::SIDE_TOP_LEFT + WideImage::SIDE_BOTTOM_RIGHT);
          * $right_corners = $image->roundCorners(15, $white, 2, WideImage::SIDE_RIGHT);
          * 
-         * 
+         *
          * @param int $radius     Radius of the corners
          * @param int $color      The color of corners. If null, corners are rendered transparent (slower than using a solid color).
          * @param int $smoothness Specify the level of smoothness. Suggested values from 1 to 4.
@@ -642,10 +642,10 @@
 
         /**
          * Returns an image with applied mask.
-         * 
+         *
          * A mask is a grayscale image, where the shade determines the alpha channel. Black is fully transparent
          * and white is fully opaque.
-         * 
+         *
          * @param WideImage_Image $mask The mask image, greyscale
          * @param mixed           $left Left coordinate, smart coordinate
          * @param mixed           $top  Top coordinate, smart coordinate
@@ -689,23 +689,23 @@
 
         /**
          * Returns a cropped rectangular portion of the image.
-         * 
+         *
          * If the rectangle specifies area that is out of bounds, it's limited to the current image bounds.
-         * 
+         *
          * Examples:
          * 
          * $cropped = $img->crop(10, 10, 150, 200); // crops a 150x200 rect at (10, 10)
          * $cropped = $img->crop(-100, -50, 100, 50); // crops a 100x50 rect at the right-bottom of the image
          * $cropped = $img->crop('25%', '25%', '50%', '50%'); // crops a 50%x50% rect from the center of the image
          * 
-         * 
+         *
          * This operation supports alignment notation in left/top coordinates.
          * Example:
          * 
          * $cropped = $img->crop("right", "bottom", 100, 200); // crops a 100x200 rect from right bottom
          * $cropped = $img->crop("center", "middle", 50, 30); // crops a 50x30 from the center of the image
          * 
-         * 
+         *
          * @param mixed $left   Left-coordinate of the crop rect, smart coordinate
          * @param mixed $top    Top-coordinate of the crop rect, smart coordinate
          * @param mixed $width  Width of the crop rect, smart coordinate
@@ -721,13 +721,13 @@
         /**
          * Performs an auto-crop on the image.
          *
-         * The image is auto-cropped from each of four sides. All sides are 
-         * scanned for pixels that differ from $base_color for more than 
-         * $rgb_threshold in absolute RGB difference. If more than $pixel_cutoff 
+         * The image is auto-cropped from each of four sides. All sides are
+         * scanned for pixels that differ from $base_color for more than
+         * $rgb_threshold in absolute RGB difference. If more than $pixel_cutoff
          * differentiating pixels are found, that line is considered to be the crop line for the side.
-         * If the line isn't different enough, the algorithm procedes to the next line 
+         * If the line isn't different enough, the algorithm procedes to the next line
          * towards the other edge of the image.
-         * 
+         *
          * When the crop rectangle is found, it's enlarged by the $margin value on each of the four sides.
          *
          * @param int $margin        Margin for the crop rectangle, can be negative.
@@ -758,7 +758,7 @@
 
         /**
          * Returns a grayscale copy of the image.
-         * 
+         *
          * @return WideImage_Image grayscale copy
          **/
         public function asGrayscale()
@@ -768,7 +768,7 @@
 
         /**
          * Returns a mirrored copy of the image.
-         * 
+         *
          * @return WideImage_Image Mirrored copy
          **/
         public function mirror()
@@ -778,7 +778,7 @@
 
         /**
          * Applies the unsharp filter.
-         * 
+         *
          * @param float $amount
          * @param float $radius
          * @param float $threshold
@@ -792,7 +792,7 @@
 
         /**
          * Returns a flipped (mirrored over horizontal line) copy of the image.
-         * 
+         *
          * @return WideImage_Image Flipped copy
          **/
         public function flip()
@@ -802,7 +802,7 @@
 
         /**
          * Corrects gamma on the image.
-         * 
+         *
          * @param float $inputGamma
          * @param float $outputGamma
          *
@@ -815,9 +815,9 @@
 
         /**
          * Adds noise to the image.
-         * 
+         *
          * @author Tomasz Kapusta
-         * 
+         *
          * @param int    $amount Number of noise pixels to add
          * @param string $type   Type of noise 'salt&pepper', 'color' or 'mono'
          *
@@ -860,7 +860,7 @@
 
         /**
          * Returns a copy of the image object.
-         * 
+         *
          * @return WideImage_Image The copy
          **/
         public function copy()
@@ -874,7 +874,7 @@
 
         /**
          * Copies this image onto another image.
-         * 
+         *
          * @param WideImage_Image $dest
          * @param int             $left
          * @param int             $top
@@ -888,21 +888,21 @@
 
         /**
          * Returns the canvas object.
-         * 
+         *
          * The Canvas object can be used to draw text and shapes on the image
-         * 
+         *
          * Examples:
          * 
          * $img = WideImage::load('pic.jpg);
          * $canvas = $img->getCanvas();
          * $canvas->useFont('arial.ttf', 15, $img->allocateColor(200, 220, 255));
          * $canvas->writeText(10, 50, "Hello world!");
-         * 
+         *
          * $canvas->filledRectangle(10, 10, 80, 40, $img->allocateColor(255, 127, 255));
          * $canvas->line(60, 80, 30, 100, $img->allocateColor(255, 0, 0));
          * $img->saveToFile('new.png');
          * 
-         * 
+         *
          * @return WideImage_Canvas The Canvas object
          **/
         public function getCanvas()
@@ -916,14 +916,14 @@
 
         /**
          * Returns true if the image is true-color, false otherwise.
-         * 
+         *
          * @return bool
          **/
         abstract public function isTrueColor();
 
         /**
          * Returns a true-color copy of the image.
-         * 
+         *
          * @return WideImage_TrueColorImage
          **/
         abstract public function asTrueColor();
@@ -933,7 +933,7 @@
          *
          * @param int  $nColors      Number of colors in the resulting image, more than 0, less or equal to 255
          * @param bool $dither       Use dithering or not
-         * @param bool $matchPalette Set to true to use imagecolormatch() to match the resulting palette more closely to the original image 
+         * @param bool $matchPalette Set to true to use imagecolormatch() to match the resulting palette more closely to the original image
          *
          * @return WideImage_Image
          **/
@@ -941,28 +941,28 @@
 
         /**
          * Retrieve an image with selected channels.
-         * 
+         *
          * Examples:
          * 
          * $channels = $img->getChannels('red', 'blue');
          * $channels = $img->getChannels('alpha', 'green');
          * $channels = $img->getChannels(array('green', 'blue'));
          * 
-         * 
+         *
          * @return WideImage_Image
          **/
         abstract public function getChannels();
 
         /**
          * Returns an image without an alpha channel.
-         * 
+         *
          * @return WideImage_Image
          **/
         abstract public function copyNoAlpha();
 
         /**
          * Returns an array of serializable protected variables. Called automatically upon serialize().
-         * 
+         *
          * @return array
          */
         public function __sleep()
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php b/public/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php
index 7080c8a97..0a6bce442 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/MapperFactory.php
@@ -29,7 +29,7 @@
 
         /**
          * Returns a mapper, based on the $uri and $format.
-         * 
+         *
          * @param string $uri    File URI
          * @param string $format File format (extension or mime-type) or null
          *
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php
index c53c65f42..2b451d809 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/AutoCrop.php
@@ -11,7 +11,7 @@
     {
         /**
          * Executes the auto-crop operation on the $img.
-         * 
+         *
          * @param WideImage_Image $img
          * @param int             $rgb_threshold The difference in RGB from $base_color
          * @param int             $pixel_cutoff  The number of pixels on each border that must be over $rgb_threshold
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php
index f94fb582d..7584d4d24 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsPalette.php
@@ -6,7 +6,7 @@
 
     /**
      * CopyChannelsPalette operation class.
-     * 
+     *
      * This operation is intended to be used on palette images
      */
     class WideImage_Operation_CopyChannelsPalette
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php
index 17a768854..8589a44e4 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/CopyChannelsTrueColor.php
@@ -6,14 +6,14 @@
 
     /**
      * CopyChannelsTrueColor operation class.
-     * 
+     *
      * Used to perform CopyChannels operation on truecolor images
      */
     class WideImage_Operation_CopyChannelsTrueColor
     {
         /**
          * Returns an image with only specified channels copied.
-         * 
+         *
          * @param WideImage_Image $img
          * @param array           $channels
          *
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php
index 8dd0f7de8..ef7cab773 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/ResizeCanvas.php
@@ -11,7 +11,7 @@
     {
         /**
          * Returns an image with a resized canvas.
-         * 
+         *
          * The image is filled with $color. Use $scale to determine, when to resize.
          *
          * @param WideImage_Image  $img
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php
index f1d212b97..d175c91e2 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/Operation/Unsharp.php
@@ -6,7 +6,7 @@
 
     /**
      * Unsharp filter.
-     * 
+     *
      * This filter was taken from http://vikjavev.no/computing/ump.php,
      * the original author Torstein Hønsi. Adapted to fit better within
      * the Wideimage package.
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php b/public/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php
index 456e76058..a053a8700 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/OperationFactory.php
@@ -3,9 +3,6 @@
      * @author Gasper Kozak
      * @copyright 2007-2011
      **/
-
-    /**
-     */
     class WideImage_UnknownImageOperationException extends WideImage_Exception
     {
     }
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php b/public/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php
index f39253d73..c69d5ac5d 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/PaletteImage.php
@@ -3,9 +3,6 @@
      * @author Gasper Kozak
      * @copyright 2007-2011
      **/
-
-    /**
-     */
     class WideImage_PaletteImage extends WideImage_Image
     {
         /**
@@ -52,7 +49,7 @@
 
         /**
          * Returns a copy of the image.
-         * 
+         *
          * @param $trueColor True if the new image should be truecolor
          *
          * @return WideImage_Image
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php b/public/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php
index 00fbcc4da..761302b2c 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/TrueColorImage.php
@@ -74,7 +74,7 @@
 
         /**
          * Allocates a color and returns its index.
-         * 
+         *
          * This method accepts either each component as an integer value,
          * or an associative array that holds the color's components in keys
          * 'red', 'green', 'blue', 'alpha'.
diff --git a/public/filemanager/connectors/php/inc/wideimage/lib/WideImage.php b/public/filemanager/connectors/php/inc/wideimage/lib/WideImage.php
index 1583b34ea..dd2d6dc6a 100644
--- a/public/filemanager/connectors/php/inc/wideimage/lib/WideImage.php
+++ b/public/filemanager/connectors/php/inc/wideimage/lib/WideImage.php
@@ -18,20 +18,14 @@
     require_once WideImage::path().'Font/GDF.php';
     require_once WideImage::path().'Font/PS.php';
 
-    /**
-     */
     class WideImage_InvalidImageHandleException extends WideImage_Exception
     {
     }
 
-    /**
-     */
     class WideImage_InvalidImageSourceException extends WideImage_Exception
     {
     }
 
-    /**
-     */
     class WideImage_GDFunctionResultException extends WideImage_Exception
     {
     }
@@ -92,12 +86,12 @@
 
         /**
          * Registers a custom mapper for image loading and saving.
-         * 
+         *
          * Example:
          * 
          * 	WideImage::registerCustomMapper('WideImage_Mapper_TGA', 'image/tga', 'tga');
          * 
-         * 
+         *
          * @param string $mapper_class_name
          * @param string $mime_type
          * @param string $extension
@@ -109,18 +103,18 @@
 
         /**
          * Loads an image from a file, URL, HTML input file field, binary string, or a valid image handle.
-         * The image format is auto-detected. 
-         * 
+         * The image format is auto-detected.
+         *
          * Currently supported formats: PNG, GIF, JPG, BMP, TGA, GD, GD2.
-         * 
+         *
          * This function analyzes the input and decides whether to use WideImage::loadFromHandle(),
          * WideImage::loadFromFile(), WideImage::loadFromUpload() or WideImage::loadFromString(),
          * all of which you can also call directly to spare WideImage some guessing.
-         * 
-         * Arrays are supported for upload fields; it returns an array of loaded images. 
-         * To load only a single image from an array field, use WideImage::loadFromUpload('img', $i), 
+         *
+         * Arrays are supported for upload fields; it returns an array of loaded images.
+         * To load only a single image from an array field, use WideImage::loadFromUpload('img', $i),
          * where $i is the index of the image you want to load.
-         * 
+         *
          * 
          * $img = WideImage::load('http://url/image.png'); // image URL
          * $img = WideImage::load('/path/to/image.png'); // local file path
@@ -128,7 +122,7 @@
          * $img = WideImage::load(imagecreatetruecolor(10, 10)); // a GD resource
          * $img = WideImage::load($image_data); // binary string containing image data
          * 
-         * 
+         *
          * @param mixed $source File name, url, HTML file input field name, binary string, or a GD image resource
          *
          * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
@@ -175,7 +169,7 @@
 
         /**
          * Create and load an image from a file or URL. The image format is auto-detected.
-         * 
+         *
          * @param string $uri File or url
          *
          * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
@@ -217,7 +211,7 @@
 
         /**
          * Create and load an image from a string. Format is auto-detected.
-         * 
+         *
          * @param string $string Binary data, i.e. from BLOB field in the database
          *
          * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
@@ -249,19 +243,19 @@
 
         /**
          * Create and load an image from an image handle.
-         * 
-         * Note: the resulting image object takes ownership of the passed 
-         * handle. When the newly-created image object is destroyed, the handle is 
-         * destroyed too, so it's not a valid image handle anymore. In order to 
-         * preserve the handle for use after object destruction, you have to call 
+         *
+         * Note: the resulting image object takes ownership of the passed
+         * handle. When the newly-created image object is destroyed, the handle is
+         * destroyed too, so it's not a valid image handle anymore. In order to
+         * preserve the handle for use after object destruction, you have to call
          * WideImage_Image::releaseHandle() on the created image instance prior to its
          * destruction.
-         * 
+         *
          * 
          * $handle = imagecreatefrompng('file.png');
          * $image = WideImage::loadFromHandle($handle);
          * 
-         * 
+         *
          * @param resource $handle A valid GD image resource
          *
          * @return WideImage_Image WideImage_PaletteImage or WideImage_TrueColorImage instance
@@ -281,11 +275,11 @@
 
         /**
          * This method loads a file from the $_FILES array. The image format is auto-detected.
-         * 
+         *
          * You only have to pass the field name as the parameter. For array fields, this function will
          * return an array of image objects, unless you specify the $index parameter, which will
          * load the desired image.
-         * 
+         *
          * @param $field_name Name of the key in $_FILES array
          * @param int $index The index of the file to load (if the input field is an array)
          *
@@ -321,7 +315,7 @@
 
         /**
          * Factory method for creating a palette image.
-         * 
+         *
          * @param int $width
          * @param int $height
          *
@@ -334,7 +328,7 @@
 
         /**
          * Factory method for creating a true-color image.
-         * 
+         *
          * @param int $width
          * @param int $height
          *
@@ -347,7 +341,7 @@
 
         /**
          * Check whether the given handle is a valid GD resource.
-         * 
+         *
          * @param mixed $handle The variable to check
          *
          * @return bool
@@ -359,7 +353,7 @@
 
         /**
          * Throws exception if the handle isn't a valid GD resource.
-         * 
+         *
          * @param mixed $handle The variable to check
          */
         public static function assertValidImageHandle($handle)
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/CanvasTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/CanvasTest.php
index 1693c6a66..92d69b12f 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/CanvasTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/CanvasTest.php
@@ -1,10 +1,6 @@
 assertRGBEqual($copy->getRGBAt(85, 85), 0, 255, 0);
             $this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 255, 0);
             $this->assertRGBEqual($copy->getRGBAt(50, 50), 0, 127, 0);
-            
+
             $copy = $img->copyChannels('blue');
             $this->assertFalse($img->getHandle() === $copy->getHandle());
             $this->assertTrue($copy instanceof WideImage_TrueColorImage);
@@ -84,7 +80,7 @@
             $this->assertRGBEqual($copy->getRGBAt(85, 85), 0, 0, 0);
             $this->assertRGBEqual($copy->getRGBAt(15, 85), 0, 0, 0);
             $this->assertRGBEqual($copy->getRGBAt(50, 50), 0, 0, 127);
-            
+
             $img = WideImage::load(IMG_PATH . '100x100-blue-alpha.png');
             $copy = $img->copyChannels('alpha');
             $this->assertRGBNear($copy->getRGBAt(25, 25), 0, 0, 0, 0.25 * 127);
diff --git a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetMaskTest.php b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetMaskTest.php
index 73a3fe9b2..9636ab49a 100644
--- a/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetMaskTest.php
+++ b/public/filemanager/connectors/php/inc/wideimage/test/tests/Operation/GetMaskTest.php
@@ -1,10 +1,6 @@
 
  * @copyright Copyright (c) 2008, Rackspace US, Inc.
  */
-
-/**
- */
 require_once 'cloudfiles_exceptions.php';
 require 'cloudfiles_http.php';
 define('DEFAULT_CF_API_VERSION', 1);
@@ -232,14 +229,14 @@ class CF_Authentication
      * #Pass Cached URL's and Token as Args
      * $auth->load_cached_credentials("auth_token", "storage_url", "cdn_management_url");
      * 
-     * 
+     *
      * @param string $auth_token  A Cloud Files Auth Token (Required)
      * @param string $storage_url The Cloud Files Storage URL (Required)
      * @param string $cdnm_url    CDN Management URL (Required)
      *
      * @throws SyntaxException If any of the Required Arguments are missing
      *
-     * @return bool True if successful 
+     * @return bool True if successful
      */
     public function load_cached_credentials($auth_token, $storage_url, $cdnm_url)
     {
@@ -267,7 +264,7 @@ class CF_Authentication
      * $auth->authenticate();
      * $array = $auth->export_credentials();
      * 
-     * 
+     *
      * @return array of url's and an auth token.
      */
     public function export_credentials()
@@ -408,9 +405,9 @@ class CF_Connection
      *
      * Example:
      * 
-     *  
+     *
      * $conn->close();
-     * 
+     *
      * 
      *
      * Will close all current cUrl active connections.
@@ -1103,7 +1100,7 @@ class CF_Container
      * $container->purge_from_cdn("user@domain.com");
      * # or
      * $container->purge_from_cdn();
-     * # or 
+     * # or
      * $container->purge_from_cdn("user1@domain.com,user2@domain.com");.
      *
      * @returns boolean True if successful
@@ -1220,7 +1217,7 @@ class CF_Container
      * uploaded to a ".CDN_ACCESS_LOGS" container in the form of
      * "container_name.YYYYMMDDHH-XXXX.gz". Requires CDN be enabled on
      * the account.
-     * 
+     *
      * Example:
      * 
      * # ... authentication code excluded (see previous examples) ...
@@ -1419,7 +1416,7 @@ class CF_Container
      * # Grab subsets of all storage objects
      * #
      * $first_ten = $images->list_objects(10);
-     * 
+     *
      * # Note the use of the previous result's last object name being
      * # used as the 'marker' parameter to fetch the next 10 objects
      * #
@@ -1664,7 +1661,7 @@ class CF_Container
  * Object operations.
  *
  * An Object is analogous to a file on a conventional filesystem. You can
- * read data from, or write data to your Objects. You can also associate 
+ * read data from, or write data to your Objects. You can also associate
  * arbitrary metadata with them.
  */
 class CF_Object
@@ -1739,7 +1736,7 @@ class CF_Object
      *
      * if fileinfo is not available it will try to use the internal
      * mime_content_type function.
-     * 
+     *
      * @param string $handle name of file or buffer to guess the type from
      *
      * @throws BadContentTypeException
@@ -1819,8 +1816,6 @@ class CF_Object
         if ($this->container->cdn_enabled) {
             return $this->container->cdn_uri.'/'.$this->name;
         }
-
-        return;
     }
 
     /**
@@ -2189,7 +2184,7 @@ class CF_Object
      * $obj->purge_from_cdn("user@domain.com");
      * # or
      * $obj->purge_from_cdn();
-     * # or 
+     * # or
      * $obj->purge_from_cdn("user1@domain.com,user2@domain.com");.
      *
      * @returns boolean True if successful
diff --git a/public/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php b/public/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php
index 0c8222173..00fa7b3e1 100644
--- a/public/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php
+++ b/public/filemanager/connectors/php/plugins/rsc/cloudfiles_http.php
@@ -23,9 +23,6 @@
  * @author Eric "EJ" Johnson 
  * @copyright Copyright (c) 2008, Rackspace US, Inc.
  */
-
-/**
- */
 require_once 'cloudfiles_exceptions.php';
 
 define('PHP_CF_VERSION', '1.7.7');
@@ -172,8 +169,6 @@ class CF_Http
             throw new IOException('Could not use CA bundle: '
                 .$this->cabundle_path);
         }
-
-        return;
     }
 
     // Uses separate cURL connection to authenticate
@@ -1320,8 +1315,6 @@ class CF_Http
             curl_setopt($ch, CURLOPT_NOBODY, 1);
         }
         $this->connections[$conn_type] = $ch;
-
-        return;
     }
 
     private function _reset_callback_vars()
diff --git a/resources/views/themes/default1/admin/helpdesk/setting.php b/resources/views/themes/default1/admin/helpdesk/setting.php
index b5b8ad46d..e74c76cbe 100644
--- a/resources/views/themes/default1/admin/helpdesk/setting.php
+++ b/resources/views/themes/default1/admin/helpdesk/setting.php
@@ -1,6 +1,6 @@