nilsteampassnet / TeamPass

includes/libraries/Authentication/phpseclib/File/X509.php

Doc Comments +2 added lines, -2 removed lines

@@ -1588,7 +1588,7 @@ 
      *
      * @param array ref $root
      * @param string $path
-     * @param object $asn1
+     * @param ASN1 $asn1
      * @access private
      */
     function _mapInExtensions(&$root, $path, $asn1)
@@ -1638,7 +1638,7 @@ 
      *
      * @param array ref $root
      * @param string $path
-     * @param object $asn1
+     * @param ASN1 $asn1
      * @access private
      */
     function _mapOutExtensions(&$root, $path, $asn1)

includes/libraries/Authentication/TwoFactorAuth/TwoFactorAuth.php

Doc Comments +1 added lines

@@ -168,6 +168,7 @@
 
     /**
      * Builds a string to be encoded in a QR code
+     * @param string $label
      */
     public function getQRText($label, $secret)
     {

includes/libraries/Encryption/Encryption/KeyProtectedByPassword.php

Doc Comments +1 added lines

@@ -76,6 +76,7 @@
      * @throws Ex\EnvironmentIsBrokenException
      * @throws Ex\WrongKeyOrModifiedCiphertextException
      *
+     * @param string $password
      * @return Key
      */
     public function unlockKey($password)

includes/libraries/Pdf/Tfpdf/font/unifont/ttfonts.php

Doc Comments +3 added lines

@@ -150,6 +150,9 @@
 		return array($hi, $lo);
 	}
 
+	/**
+	 * @param string $tag
+	 */
 	function get_table_pos($tag) {
 		$offset = $this->tables[$tag]['offset'];
 		$length = $this->tables[$tag]['length'];

Spacing +25 added lines, -25 removed lines

@@ -70,7 +70,7 @@ 
 var $maxStrLenRead;
 
 	function __construct() {
-		$this->maxStrLenRead = 200000;	// Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
+		$this->maxStrLenRead = 200000; // Maximum size of glyf table to read in as string (otherwise reads each glyph from file)
 	}
 
 
@@ -79,7 +79,7 @@ 
 	 */
 	function getMetrics($file) {
 		$this->filename = $file;
-		$this->fh = fopen($file,'rb') or die('Can\'t open file ' . $file);
+		$this->fh = fopen($file, 'rb') or die('Can\'t open file '.$file);
 		$this->_pos = 0;
 		$this->charWidths = '';
 		$this->glyphPos = array();
@@ -158,7 +158,7 @@ 
 
 	function seek($pos) {
 		$this->_pos = $pos;
-		fseek($this->fh,$this->_pos);
+		fseek($this->fh, $this->_pos);
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 */
 	function skip($delta) {
 		$this->_pos = $this->_pos + $delta;
-		fseek($this->fh,$this->_pos);
+		fseek($this->fh, $this->_pos);
 	}
 
 	/**
@@ -202,44 +202,44 @@ 
 
 	function read_ushort() {
 		$this->_pos += 2;
-		$s = fread($this->fh,2);
-		return (ord($s[0])<<8) + ord($s[1]);
+		$s = fread($this->fh, 2);
+		return (ord($s[0]) << 8) + ord($s[1]);
 	}
 
 	function read_ulong() {
 		$this->_pos += 4;
-		$s = fread($this->fh,4);
+		$s = fread($this->fh, 4);
 		// if large uInt32 as an integer, PHP converts it to -ve
-		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
+		return (ord($s[0]) * 16777216) + (ord($s[1]) << 16) + (ord($s[2]) << 8) + ord($s[3]); // 	16777216  = 1<<24
 	}
 
 	function get_ushort($pos) {
-		fseek($this->fh,$pos);
-		$s = fread($this->fh,2);
-		return (ord($s[0])<<8) + ord($s[1]);
+		fseek($this->fh, $pos);
+		$s = fread($this->fh, 2);
+		return (ord($s[0]) << 8) + ord($s[1]);
 	}
 
 	function get_ulong($pos) {
-		fseek($this->fh,$pos);
-		$s = fread($this->fh,4);
+		fseek($this->fh, $pos);
+		$s = fread($this->fh, 4);
 		// iF large uInt32 as an integer, PHP converts it to -ve
-		return (ord($s[0])*16777216) + (ord($s[1])<<16) + (ord($s[2])<<8) + ord($s[3]); // 	16777216  = 1<<24
+		return (ord($s[0]) * 16777216) + (ord($s[1]) << 16) + (ord($s[2]) << 8) + ord($s[3]); // 	16777216  = 1<<24
 	}
 
 	function pack_short($val) {
-		if ($val<0) { 
+		if ($val < 0) { 
 			$val = abs($val);
 			$val = ~$val;
 			$val += 1;
 		}
-		return pack("n",$val); 
+		return pack("n", $val); 
 	}
 
 	/**
 	 * @param string $value
 	 */
 	function splice($stream, $offset, $value) {
-		return substr($stream,0,$offset) . $value . substr($stream,$offset+strlen($value));
+		return substr($stream, 0, $offset).$value.substr($stream, $offset + strlen($value));
 	}
 
 	/**
@@ -252,19 +252,19 @@ 
 	}
 
 	function _set_short($stream, $offset, $val) {
-		if ($val<0) { 
+		if ($val < 0) { 
 			$val = abs($val);
 			$val = ~$val;
 			$val += 1;
 		}
-		$up = pack("n",$val); 
+		$up = pack("n", $val); 
 		return $this->splice($stream, $offset, $up);
 	}
 
 	function get_chunk($pos, $length) {
-		fseek($this->fh,$pos);
-		if ($length <1) { return ''; }
-		return (fread($this->fh,$length));
+		fseek($this->fh, $pos);
+		if ($length < 1) { return ''; }
+		return (fread($this->fh, $length));
 	}
 
 	/**
@@ -273,8 +273,8 @@ 
 	function get_table($tag) {
 		list($pos, $length) = $this->get_table_pos($tag);
 		if ($length == 0) { die('Truetype font ('.$this->filename.'): error reading table: '.$tag); }
-		fseek($this->fh,$pos);
-		return (fread($this->fh,$length));
+		fseek($this->fh, $pos);
+		return (fread($this->fh, $length));
 	}
 
 	/**
@@ -1034,7 +1034,7 @@ 
 	/**
 	 * @param integer $unicode_cmap_offset
 	 */
-	function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph ) {
+	function getCMAP4($unicode_cmap_offset, &$glyphToChar, &$charToGlyph) {
 		$this->maxUniChar = 0;
 		$this->seek($unicode_cmap_offset + 2);
 		$length = $this->read_ushort();

includes/libraries/Pdf/Tfpdf/fpdf.php

Doc Comments +1 added lines

@@ -164,6 +164,7 @@
 
     /**
     * Get MD5 as binary string
+    * @param string $string
     */
     function _md5_16($string)
     {

Spacing +3 added lines, -3 removed lines

@@ -77,11 +77,11 @@
      * - If an owner password is set, document can be opened in privilege mode with no
      *   restriction if that password is entered
      */
-    function SetProtection($permissions=array(), $user_pass='', $owner_pass=null)
+    function SetProtection($permissions = array(), $user_pass = '', $owner_pass = null)
     {
-        $options = array('print' => 4, 'modify' => 8, 'copy' => 16, 'annot-forms' => 32 );
+        $options = array('print' => 4, 'modify' => 8, 'copy' => 16, 'annot-forms' => 32);
         $protection = 192;
-        foreach($permissions as $permission)
+        foreach ($permissions as $permission)
         {
             if (!isset($options[$permission])) {
                             $this->Error('Incorrect permission: '.$permission);

includes/libraries/Pdf/Tfpdf/tfpdf.class.php

Doc Comments +3 added lines

@@ -1331,6 +1331,9 @@
     }
 }
 
+/**
+ * @param string $size
+ */
 function _getpagesize($size)
 {
     if (is_string($size))

Spacing +130 added lines, -130 removed lines

@@ -174,12 +174,12 @@ 
  * @param double $left
  * @param double $top
  */
-function SetMargins($left, $top, $right=null)
+function SetMargins($left, $top, $right = null)
 {
     // Set left, top and right margins
     $this->lMargin = $left;
     $this->tMargin = $top;
-    if($right===null) {
+    if ($right === null) {
             $right = $left;
     }
     $this->rMargin = $right;
@@ -208,25 +208,25 @@ 
 /**
  * @param boolean $auto
  */
-function SetAutoPageBreak($auto, $margin=0)
+function SetAutoPageBreak($auto, $margin = 0)
 {
     // Set auto page break mode and triggering margin
     $this->AutoPageBreak = $auto;
     $this->bMargin = $margin;
-    $this->PageBreakTrigger = $this->h-$margin;
+    $this->PageBreakTrigger = $this->h - $margin;
 }
 
 /**
  * @param string $zoom
  */
-function SetDisplayMode($zoom, $layout='default')
+function SetDisplayMode($zoom, $layout = 'default')
 {
     // Set display mode in viewer
-    if($zoom=='fullpage' || $zoom=='fullwidth' || $zoom=='real' || $zoom=='default' || !is_string($zoom))
+    if ($zoom == 'fullpage' || $zoom == 'fullwidth' || $zoom == 'real' || $zoom == 'default' || !is_string($zoom))
         $this->ZoomMode = $zoom;
     else
         $this->Error('Incorrect zoom display mode: '.$zoom);
-    if($layout=='single' || $layout=='continuous' || $layout=='two' || $layout=='default')
+    if ($layout == 'single' || $layout == 'continuous' || $layout == 'two' || $layout == 'default')
         $this->LayoutMode = $layout;
     else
         $this->Error('Incorrect layout display mode: '.$layout);
@@ -404,133 +404,133 @@ 
     return $this->page;
 }
 
-function SetDrawColor($r, $g=null, $b=null)
+function SetDrawColor($r, $g = null, $b = null)
 {
     // Set color for all stroking operations
-    if(($r==0 && $g==0 && $b==0) || $g===null) {
-            $this->DrawColor = sprintf('%.3F G',$r/255);
+    if (($r == 0 && $g == 0 && $b == 0) || $g === null) {
+            $this->DrawColor = sprintf('%.3F G', $r / 255);
     } else {
-            $this->DrawColor = sprintf('%.3F %.3F %.3F RG',$r/255,$g/255,$b/255);
+            $this->DrawColor = sprintf('%.3F %.3F %.3F RG', $r / 255, $g / 255, $b / 255);
     }
-    if($this->page>0) {
+    if ($this->page > 0) {
             $this->_out($this->DrawColor);
     }
     }
 
-function SetFillColor($r, $g=null, $b=null)
+function SetFillColor($r, $g = null, $b = null)
 {
     // Set color for all filling operations
-    if(($r==0 && $g==0 && $b==0) || $g===null) {
-            $this->FillColor = sprintf('%.3F g',$r/255);
+    if (($r == 0 && $g == 0 && $b == 0) || $g === null) {
+            $this->FillColor = sprintf('%.3F g', $r / 255);
     } else {
-            $this->FillColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+            $this->FillColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);
     }
-    $this->ColorFlag = ($this->FillColor!=$this->TextColor);
-    if($this->page>0) {
+    $this->ColorFlag = ($this->FillColor != $this->TextColor);
+    if ($this->page > 0) {
             $this->_out($this->FillColor);
     }
     }
 
-function SetTextColor($r, $g=null, $b=null)
+function SetTextColor($r, $g = null, $b = null)
 {
     // Set color for text
-    if(($r==0 && $g==0 && $b==0) || $g===null) {
-            $this->TextColor = sprintf('%.3F g',$r/255);
+    if (($r == 0 && $g == 0 && $b == 0) || $g === null) {
+            $this->TextColor = sprintf('%.3F g', $r / 255);
     } else {
-            $this->TextColor = sprintf('%.3F %.3F %.3F rg',$r/255,$g/255,$b/255);
+            $this->TextColor = sprintf('%.3F %.3F %.3F rg', $r / 255, $g / 255, $b / 255);
     }
-    $this->ColorFlag = ($this->FillColor!=$this->TextColor);
+    $this->ColorFlag = ($this->FillColor != $this->TextColor);
 }
 
 function GetStringWidth($s)
 {
     // Get width of a string in the current font
-    $s = (string)$s;
+    $s = (string) $s;
     $cw = &$this->CurrentFont['cw'];
-    $w=0;
+    $w = 0;
     if ($this->unifontSubset) {
         $unicode = $this->UTF8StringToArray($s);
-        foreach($unicode as $char) {
-            if (isset($cw[$char])) { $w += (ord($cw[2*$char])<<8) + ord($cw[2*$char+1]); } else if($char>0 && $char<128 && isset($cw[chr($char)])) { $w += $cw[chr($char)]; } else if(isset($this->CurrentFont['desc']['MissingWidth'])) { $w += $this->CurrentFont['desc']['MissingWidth']; } else if(isset($this->CurrentFont['MissingWidth'])) { $w += $this->CurrentFont['MissingWidth']; } else { $w += 500; }
+        foreach ($unicode as $char) {
+            if (isset($cw[$char])) { $w += (ord($cw[2 * $char]) << 8) + ord($cw[2 * $char + 1]); } else if ($char > 0 && $char < 128 && isset($cw[chr($char)])) { $w += $cw[chr($char)]; } else if (isset($this->CurrentFont['desc']['MissingWidth'])) { $w += $this->CurrentFont['desc']['MissingWidth']; } else if (isset($this->CurrentFont['MissingWidth'])) { $w += $this->CurrentFont['MissingWidth']; } else { $w += 500; }
         }
     } else {
         $l = strlen($s);
-        for($i=0;$i<$l;$i++) {
+        for ($i = 0; $i < $l; $i++) {
                     $w += $cw[$s[$i]];
         }
     }
-    return $w*$this->FontSize/1000;
+    return $w * $this->FontSize / 1000;
 }
 
 function SetLineWidth($width)
 {
     // Set line width
     $this->LineWidth = $width;
-    if($this->page>0) {
-            $this->_out(sprintf('%.2F w',$width*$this->k));
+    if ($this->page > 0) {
+            $this->_out(sprintf('%.2F w', $width * $this->k));
     }
     }
 
 function Line($x1, $y1, $x2, $y2)
 {
     // Draw a line
-    $this->_out(sprintf('%.2F %.2F m %.2F %.2F l S',$x1*$this->k,($this->h-$y1)*$this->k,$x2*$this->k,($this->h-$y2)*$this->k));
+    $this->_out(sprintf('%.2F %.2F m %.2F %.2F l S', $x1 * $this->k, ($this->h - $y1) * $this->k, $x2 * $this->k, ($this->h - $y2) * $this->k));
 }
 
-function Rect($x, $y, $w, $h, $style='')
+function Rect($x, $y, $w, $h, $style = '')
 {
     // Draw a rectangle
-    if($style=='F') {
+    if ($style == 'F') {
             $op = 'f';
-    } elseif($style=='FD' || $style=='DF') {
+    } elseif ($style == 'FD' || $style == 'DF') {
             $op = 'B';
     } else {
             $op = 'S';
     }
-    $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s',$x*$this->k,($this->h-$y)*$this->k,$w*$this->k,-$h*$this->k,$op));
+    $this->_out(sprintf('%.2F %.2F %.2F %.2F re %s', $x * $this->k, ($this->h - $y) * $this->k, $w * $this->k, -$h * $this->k, $op));
 }
 
 /**
  * @param string $family
  */
-function AddFont($family, $style='', $file='', $uni=false)
+function AddFont($family, $style = '', $file = '', $uni = false)
 {
     // Add a TrueType, OpenType or Type1 font
     $family = strtolower($family);
     $style = strtoupper($style);
-    if($style=='IB')
-        $style='BI';
-    if($file=='') {
+    if ($style == 'IB')
+        $style = 'BI';
+    if ($file == '') {
         if ($uni) {
-        $file = str_replace(' ','',$family).strtolower($style).'.ttf';
+        $file = str_replace(' ', '', $family).strtolower($style).'.ttf';
         }
         else {
-        $file = str_replace(' ','',$family).strtolower($style).'.php';
+        $file = str_replace(' ', '', $family).strtolower($style).'.php';
         }
     }
     $fontkey = $family.$style;
-    if(isset($this->fonts[$fontkey]))
+    if (isset($this->fonts[$fontkey]))
         return;
 
     if ($uni) {
-        if (defined("_SYSTEM_TTFONTS") && file_exists(_SYSTEM_TTFONTS.$file )) { $ttffilename = _SYSTEM_TTFONTS.$file ; }
-        else { $ttffilename = $this->_getfontpath().'unifont/'.$file ; }
-        $unifilename = $this->_getfontpath().'unifont/'.strtolower(substr($file ,0,(strpos($file ,'.'))));
+        if (defined("_SYSTEM_TTFONTS") && file_exists(_SYSTEM_TTFONTS.$file)) { $ttffilename = _SYSTEM_TTFONTS.$file; }
+        else { $ttffilename = $this->_getfontpath().'unifont/'.$file; }
+        $unifilename = $this->_getfontpath().'unifont/'.strtolower(substr($file, 0, (strpos($file, '.'))));
         $name = '';
         $originalsize = 0;
         $ttfstat = stat($ttffilename);
         if (file_exists($unifilename.'.mtx.php')) {
             include($unifilename.'.mtx.php');
         }
-        if (!isset($type) ||  !isset($name) || $originalsize != $ttfstat['size']) {
+        if (!isset($type) || !isset($name) || $originalsize != $ttfstat['size']) {
             $ttffile = $ttffilename;
             require_once($this->_getfontpath().'unifont/ttfonts.php');
             $ttf = new TTFontFile();
             $ttf->getMetrics($ttffile);
             $cw = $ttf->charWidths;
-            $name = preg_replace('/[ ()]/','',$ttf->fullName);
+            $name = preg_replace('/[ ()]/', '', $ttf->fullName);
 
-            $desc= array('Ascent'=>round($ttf->ascent),
+            $desc = array('Ascent'=>round($ttf->ascent),
             'Descent'=>round($ttf->descent),
             'CapHeight'=>round($ttf->capHeight),
             'Flags'=>$ttf->flags,
@@ -607,48 +607,48 @@ 
 /**
  * @param string $family
  */
-function SetFont($family, $style='', $size=0)
+function SetFont($family, $style = '', $size = 0)
 {
     // Select a font; size given in points
-    if($family=='') {
+    if ($family == '') {
             $family = $this->FontFamily;
     } else {
             $family = strtolower($family);
     }
     $style = strtoupper($style);
-    if(strpos($style,'U')!==false)
+    if (strpos($style, 'U') !== false)
     {
         $this->underline = true;
-        $style = str_replace('U','',$style);
+        $style = str_replace('U', '', $style);
     } else {
             $this->underline = false;
     }
-    if($style=='IB') {
+    if ($style == 'IB') {
             $style = 'BI';
     }
-    if($size==0) {
+    if ($size == 0) {
             $size = $this->FontSizePt;
     }
     // Test if font is already selected
-    if($this->FontFamily==$family && $this->FontStyle==$style && $this->FontSizePt==$size) {
+    if ($this->FontFamily == $family && $this->FontStyle == $style && $this->FontSizePt == $size) {
             return;
     }
     // Test if font is already loaded
     $fontkey = $family.$style;
-    if(!isset($this->fonts[$fontkey]))
+    if (!isset($this->fonts[$fontkey]))
     {
         // Test if one of the core fonts
-        if($family=='arial') {
+        if ($family == 'arial') {
                     $family = 'helvetica';
         }
-        if(in_array($family,$this->CoreFonts))
+        if (in_array($family, $this->CoreFonts))
         {
-            if($family=='symbol' || $family=='zapfdingbats') {
+            if ($family == 'symbol' || $family == 'zapfdingbats') {
                             $style = '';
             }
             $fontkey = $family.$style;
-            if(!isset($this->fonts[$fontkey])) {
-                            $this->AddFont($family,$style);
+            if (!isset($this->fonts[$fontkey])) {
+                            $this->AddFont($family, $style);
             }
         } else {
                     $this->Error('Undefined font: '.$family.' '.$style);
@@ -1095,11 +1095,11 @@ 
         }
     }
     // Last chunk
-    if($i!=$j) {
+    if ($i != $j) {
         if ($this->unifontSubset) {
-            $this->Cell($l,$h,mb_substr($s,$j,$i-$j,'UTF-8'),0,0,'',0,$link);
+            $this->Cell($l, $h, mb_substr($s, $j, $i - $j, 'UTF-8'), 0, 0, '', 0, $link);
         } else {
-            $this->Cell($l,$h,substr($s,$j),0,0,'',0,$link);
+            $this->Cell($l, $h, substr($s, $j), 0, 0, '', 0, $link);
         }
     }
 }
@@ -1107,86 +1107,86 @@ 
 /**
  * @param integer $h
  */
-function Ln($h=null)
+function Ln($h = null)
 {
     // Line feed; default value is last cell height
     $this->x = $this->lMargin;
-    if($h===null) {
+    if ($h === null) {
             $this->y += $this->lasth;
     } else {
             $this->y += $h;
     }
     }
 
-function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='')
+function Image($file, $x = null, $y = null, $w = 0, $h = 0, $type = '', $link = '')
 {
     // Put an image on the page
-    if(!isset($this->images[$file]))
+    if (!isset($this->images[$file]))
     {
         // First use of this image, get info
-        if($type=='')
+        if ($type == '')
         {
-            $pos = strrpos($file,'.');
-            if(!$pos) {
+            $pos = strrpos($file, '.');
+            if (!$pos) {
                             $this->Error('Image file has no extension and no type was specified: '.$file);
             }
-            $type = substr($file,$pos+1);
+            $type = substr($file, $pos + 1);
         }
         $type = strtolower($type);
-        if($type=='jpeg') {
+        if ($type == 'jpeg') {
                     $type = 'jpg';
         }
         $mtd = '_parse'.$type;
-        if(!method_exists($this,$mtd)) {
+        if (!method_exists($this, $mtd)) {
                     $this->Error('Unsupported image type: '.$type);
         }
         $info = $this->$mtd($file);
-        $info['i'] = count($this->images)+1;
+        $info['i'] = count($this->images) + 1;
         $this->images[$file] = $info;
     } else {
             $info = $this->images[$file];
     }
 
     // Automatic width and height calculation if needed
-    if($w==0 && $h==0)
+    if ($w == 0 && $h == 0)
     {
         // Put image at 96 dpi
         $w = -96;
         $h = -96;
     }
-    if($w<0) {
-            $w = -$info['w']*72/$w/$this->k;
+    if ($w < 0) {
+            $w = -$info['w'] * 72 / $w / $this->k;
     }
-    if($h<0) {
-            $h = -$info['h']*72/$h/$this->k;
+    if ($h < 0) {
+            $h = -$info['h'] * 72 / $h / $this->k;
     }
-    if($w==0) {
-            $w = $h*$info['w']/$info['h'];
+    if ($w == 0) {
+            $w = $h * $info['w'] / $info['h'];
     }
-    if($h==0) {
-            $h = $w*$info['h']/$info['w'];
+    if ($h == 0) {
+            $h = $w * $info['h'] / $info['w'];
     }
 
     // Flowing mode
-    if($y===null)
+    if ($y === null)
     {
-        if($this->y+$h>$this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
+        if ($this->y + $h > $this->PageBreakTrigger && !$this->InHeader && !$this->InFooter && $this->AcceptPageBreak())
         {
             // Automatic page break
             $x2 = $this->x;
-            $this->AddPage($this->CurOrientation,$this->CurPageSize);
+            $this->AddPage($this->CurOrientation, $this->CurPageSize);
             $this->x = $x2;
         }
         $y = $this->y;
         $this->y += $h;
     }
 
-    if($x===null) {
+    if ($x === null) {
             $x = $this->x;
     }
-    $this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q',$w*$this->k,$h*$this->k,$x*$this->k,($this->h-($y+$h))*$this->k,$info['i']));
-    if($link) {
-            $this->Link($x,$y,$w,$h,$link);
+    $this->_out(sprintf('q %.2F 0 0 %.2F %.2F %.2F cm /I%d Do Q', $w * $this->k, $h * $this->k, $x * $this->k, ($this->h - ($y + $h)) * $this->k, $info['i']));
+    if ($link) {
+            $this->Link($x, $y, $w, $h, $link);
     }
     }
 
@@ -1782,62 +1782,62 @@ 
     $this->_out('1 0 obj');
     $this->_out('<</Type /Pages');
     $kids = '/Kids [';
-    for($i=0;$i<$nb;$i++) {
-            $kids .= (3+2*$i).' 0 R ';
+    for ($i = 0; $i < $nb; $i++) {
+            $kids .= (3 + 2 * $i).' 0 R ';
     }
     $this->_out($kids.']');
     $this->_out('/Count '.$nb);
-    $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]',$wPt,$hPt));
+    $this->_out(sprintf('/MediaBox [0 0 %.2F %.2F]', $wPt, $hPt));
     $this->_out('>>');
     $this->_out('endobj');
 }
 
 function _putfonts()
 {
-    $nf=$this->n;
-    foreach($this->diffs as $diff)
+    $nf = $this->n;
+    foreach ($this->diffs as $diff)
     {
         // Encodings
         $this->_newobj();
         $this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
         $this->_out('endobj');
     }
-    foreach($this->FontFiles as $file=>$info)
+    foreach ($this->FontFiles as $file=>$info)
     {
-        if (!isset($info['type']) || $info['type']!='TTF') {
+        if (!isset($info['type']) || $info['type'] != 'TTF') {
         // Font file embedding
         $this->_newobj();
-        $this->FontFiles[$file]['n']=$this->n;
-        $font='';
-        $f=fopen($this->_getfontpath().$file,'rb',1);
-        if(!$f) {
+        $this->FontFiles[$file]['n'] = $this->n;
+        $font = '';
+        $f = fopen($this->_getfontpath().$file, 'rb', 1);
+        if (!$f) {
                     $this->Error('Font file not found');
         }
-        while(!feof($f)) {
-                    $font.=fread($f,8192);
+        while (!feof($f)) {
+                    $font .= fread($f, 8192);
         }
         fclose($f);
-        $compressed=(substr($file,-2)=='.z');
-        if(!$compressed && isset($info['length2']))
+        $compressed = (substr($file, -2) == '.z');
+        if (!$compressed && isset($info['length2']))
         {
-            $header=(ord($font[0])==128);
-            if($header)
+            $header = (ord($font[0]) == 128);
+            if ($header)
             {
                 // Strip first binary header
-                $font=substr($font,6);
+                $font = substr($font, 6);
             }
-            if($header && ord($font[$info['length1']])==128)
+            if ($header && ord($font[$info['length1']]) == 128)
             {
                 // Strip second binary header
-                $font=substr($font,0,$info['length1']).substr($font,$info['length1']+6);
+                $font = substr($font, 0, $info['length1']).substr($font, $info['length1'] + 6);
             }
         }
         $this->_out('<</Length '.strlen($font));
-        if($compressed) {
+        if ($compressed) {
                     $this->_out('/Filter /FlateDecode');
         }
         $this->_out('/Length1 '.$info['length1']);
-        if(isset($info['length2'])) {
+        if (isset($info['length2'])) {
                     $this->_out('/Length2 '.$info['length2'].' /Length3 0');
         }
         $this->_out('>>');
@@ -1845,40 +1845,40 @@ 
         $this->_out('endobj');
         }
     }
-    foreach($this->fonts as $k=>$font)
+    foreach ($this->fonts as $k=>$font)
     {
         // Font objects
         //$this->fonts[$k]['n']=$this->n+1;
         $type = $font['type'];
         $name = $font['name'];
-        if($type=='Core')
+        if ($type == 'Core')
         {
             // Standard font
-            $this->fonts[$k]['n']=$this->n+1;
+            $this->fonts[$k]['n'] = $this->n + 1;
             $this->_newobj();
             $this->_out('<</Type /Font');
             $this->_out('/BaseFont /'.$name);
             $this->_out('/Subtype /Type1');
-            if($name!='Symbol' && $name!='ZapfDingbats') {
+            if ($name != 'Symbol' && $name != 'ZapfDingbats') {
                             $this->_out('/Encoding /WinAnsiEncoding');
             }
             $this->_out('>>');
             $this->_out('endobj');
-        } elseif($type=='Type1' || $type=='TrueType')
+        } elseif ($type == 'Type1' || $type == 'TrueType')
         {
             // Additional Type1 or TrueType font
-            $this->fonts[$k]['n']=$this->n+1;
+            $this->fonts[$k]['n'] = $this->n + 1;
             $this->_newobj();
             $this->_out('<</Type /Font');
             $this->_out('/BaseFont /'.$name);
             $this->_out('/Subtype /'.$type);
             $this->_out('/FirstChar 32 /LastChar 255');
-            $this->_out('/Widths '.($this->n+1).' 0 R');
-            $this->_out('/FontDescriptor '.($this->n+2).' 0 R');
-            if($font['enc'])
+            $this->_out('/Widths '.($this->n + 1).' 0 R');
+            $this->_out('/FontDescriptor '.($this->n + 2).' 0 R');
+            if ($font['enc'])
             {
-                if(isset($font['diff'])) {
-                                    $this->_out('/Encoding '.($nf+$font['diff']).' 0 R');
+                if (isset($font['diff'])) {
+                                    $this->_out('/Encoding '.($nf + $font['diff']).' 0 R');
                 } else {
                                     $this->_out('/Encoding /WinAnsiEncoding');
                 }
@@ -2327,15 +2327,15 @@ 
     for ($i = 0; $i < $len; $i++) {
     $uni = -1;
         $h = ord($str[$i]);
-        if ( $h <= 0x7F )
+        if ($h <= 0x7F)
             $uni = $h;
-        elseif ( $h >= 0xC2 ) {
-            if ( ($h <= 0xDF) && ($i < $len -1) )
+        elseif ($h >= 0xC2) {
+            if (($h <= 0xDF) && ($i < $len - 1))
             $uni = ($h & 0x1F) << 6 | (ord($str[++$i]) & 0x3F);
-            elseif ( ($h <= 0xEF) && ($i < $len -2) )
+            elseif (($h <= 0xEF) && ($i < $len - 2))
             $uni = ($h & 0x0F) << 12 | (ord($str[++$i]) & 0x3F) << 6
                                         | (ord($str[++$i]) & 0x3F);
-            elseif ( ($h <= 0xF4) && ($i < $len -3) )
+            elseif (($h <= 0xF4) && ($i < $len - 3))
             $uni = ($h & 0x0F) << 18 | (ord($str[++$i]) & 0x3F) << 12
                                         | (ord($str[++$i]) & 0x3F) << 6
                                         | (ord($str[++$i]) & 0x3F);

includes/libraries/phpcrypt/ciphers/DES.php

Doc Comments +1 added lines, -1 removed lines

@@ -340,7 +340,7 @@
 	 * to the self::$_e[] table.
 	 * This is only used in the F() function
 	 *
-	 * @param array $r 32 bit binary, each bit in an array element
+	 * @param string $r 32 bit binary, each bit in an array element
 	 * @return string 48 bit binary string
 	 */
 	private function e($r)

install/libs/aesctr.php

Doc Comments +5 added lines, -5 removed lines

@@ -232,10 +232,10 @@ 
      *
      * Unicode multi-byte character safe
      *
-     * @param plaintext source text to be encrypted
+     * @param plaintext string text to be encrypted
      * @param password  the password to use to generate a key
-     * @param nBits     number of bits to be used in the key (128, 192, or 256)
-     * @return          encrypted text
+     * @param nBits     integer of bits to be used in the key (128, 192, or 256)
+     * @return          string text
      */
     public static function encrypt($plaintext, $password, $nBits)
     {
@@ -315,8 +315,8 @@ 
      *
      * @param ciphertext source text to be decrypted
      * @param password   the password to use to generate a key
-     * @param nBits      number of bits to be used in the key (128, 192, or 256)
-     * @return           decrypted text
+     * @param nBits      integer of bits to be used in the key (128, 192, or 256)
+     * @return           string text
      */
     public static function decrypt($ciphertext, $password, $nBits)
     {

api/functions.php

Spacing +10 added lines, -10 removed lines

@@ -1798,7 +1798,7 @@ 
                                             'type' => 'folder_deleted',
                                             'intitule' => "f".$array_category[$i],
                                             'valeur' => $folder->id.', '.$folder->parent_id.', '.
-                                                $folder->title.', '.$folder->nleft.', '.$folder->nright.', '. $folder->nlevel.', 0, 0, 0, 0'
+                                                $folder->title.', '.$folder->nleft.', '.$folder->nright.', '.$folder->nlevel.', 0, 0, 0, 0'
                                         )
                                     );
                                     //delete folder
@@ -1993,29 +1993,29 @@ 
 
                     echo json_encode($json);
                 } else {
-                    rest_error ('NO_PARAMETERS');
+                    rest_error('NO_PARAMETERS');
                 }
             } else if ($GLOBALS['request'][1] === "version") {
                 echo '{"api-version":"'.$api_version.'"}';
             } else {
-                rest_error ('NO_PARAMETERS');
+                rest_error('NO_PARAMETERS');
             }
         } else {
-            rest_error ('METHOD');
+            rest_error('METHOD');
         }
     }
 }
 
 function rest_put() {
-    if(!@count($GLOBALS['request'])==0){
+    if (!@count($GLOBALS['request']) == 0) {
         $request_uri = $GLOBALS['_SERVER']['REQUEST_URI'];
-        preg_match('/\/api(\/index.php|)\/(.*)\?apikey=(.*)/',$request_uri,$matches);
+        preg_match('/\/api(\/index.php|)\/(.*)\?apikey=(.*)/', $request_uri, $matches);
         if (count($matches) == 0) {
-            rest_error ('REQUEST_SENT_NOT_UNDERSTANDABLE');
+            rest_error('REQUEST_SENT_NOT_UNDERSTANDABLE');
         }
-        $GLOBALS['request'] =  explode('/',$matches[2]);
+        $GLOBALS['request'] = explode('/', $matches[2]);
     }
-    if(apikey_checker($GLOBALS['apikey'])) {
+    if (apikey_checker($GLOBALS['apikey'])) {
         global $server, $user, $pass, $database, $pre, $link;
         teampass_connect();
 
@@ -2025,7 +2025,7 @@ 
 /**
  * @param string $type
  */
-function rest_error ($type,$detail = 'N/A') {
+function rest_error($type, $detail = 'N/A') {
     switch ($type) {
         case 'APIKEY':
             $message = Array('err' => 'This api_key '.$GLOBALS['apikey'].' doesn\'t exist');