Completed
Pull Request — master (#438)
by Harald
03:53
created
catalog/admin/includes/classes/logger.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -45,6 +45,9 @@
 block discarded – undo
45 45
       return '<span class="smallText">Parse Time: ' . $this->timer_total . 's</span>';
46 46
     }
47 47
 
48
+    /**
49
+     * @param string $type
50
+     */
48 51
     function write($message, $type) {
49 52
       error_log(strftime(STORE_PARSE_DATE_TIME_FORMAT) . ' [' . $type . '] ' . $message . "\n", 3, STORE_PAGE_PARSE_TIME_LOG);
50 53
     }
Please login to merge, or discard this patch.
catalog/admin/includes/classes/phplot.php 1 patch
Doc Comments   +78 added lines patch added patch discarded remove patch
@@ -301,6 +301,9 @@  discard block
 block discarded – undo
301 301
 		}
302 302
 	}
303 303
 
304
+	/**
305
+	 * @param string $which_input_file
306
+	 */
304 307
 	function SetInputFile($which_input_file) { 
305 308
 		//$this->SetFileFormat($which_frmt);
306 309
 		$size = GetImageSize($which_input_file);
@@ -343,6 +346,9 @@  discard block
 block discarded – undo
343 346
 
344 347
 	}
345 348
 
349
+	/**
350
+	 * @param string $which_output_file
351
+	 */
346 352
 	function SetOutputFile($which_output_file) { 
347 353
 		$this->output_file = $which_output_file;
348 354
 		return true;
@@ -719,11 +725,18 @@  discard block
 block discarded – undo
719 725
 			$this->ndx_plot_bg_color);
720 726
 	}
721 727
 
728
+	/**
729
+	 * @param integer[] $which_color
730
+	 */
722 731
 	function SetBackgroundColor($which_color) {
723 732
 		$this->bg_color= $which_color;
724 733
 		$this->ndx_bg_color= $this->SetIndexColor($which_color);
725 734
 		return true;
726 735
 	}
736
+
737
+	/**
738
+	 * @param integer[] $which_color
739
+	 */
727 740
 	function SetPlotBgColor($which_color) {
728 741
 		$this->plot_bg_color= $which_color;
729 742
 		$this->ndx_plot_bg_color= $this->SetIndexColor($which_color);
@@ -735,36 +748,54 @@  discard block
 block discarded – undo
735 748
 		return true;
736 749
 	}
737 750
 
751
+	/**
752
+	 * @param integer[] $which_color
753
+	 */
738 754
 	function SetTitleColor($which_color) {
739 755
 		$this->title_color= $which_color;
740 756
 		$this->ndx_title_color= $this->SetIndexColor($which_color);
741 757
 		return true;
742 758
 	}
743 759
 
760
+	/**
761
+	 * @param string $which_color
762
+	 */
744 763
 	function SetTickColor ($which_color) {
745 764
 		$this->tick_color= $which_color;
746 765
 		$this->ndx_tick_color= $this->SetIndexColor($which_color);
747 766
 		return true;
748 767
 	}
749 768
 
769
+	/**
770
+	 * @param string $which_color
771
+	 */
750 772
 	function SetLabelColor ($which_color) {
751 773
 		$this->label_color= $which_color;
752 774
 		$this->ndx_label_color= $this->SetIndexColor($which_color);
753 775
 		return true;
754 776
 	}
755 777
 
778
+	/**
779
+	 * @param string $which_color
780
+	 */
756 781
 	function SetTextColor ($which_color) {
757 782
 		$this->text_color= $which_color;
758 783
 		$this->ndx_text_color= $this->SetIndexColor($which_color);
759 784
 		return true;
760 785
 	}
761 786
 
787
+	/**
788
+	 * @param integer[] $which_color
789
+	 */
762 790
 	function SetLightGridColor ($which_color) {
763 791
 		$this->light_grid_color= $which_color;
764 792
 		$this->ndx_light_grid_color= $this->SetIndexColor($which_color);
765 793
 		return true;
766 794
 	}
767 795
 
796
+	/**
797
+	 * @param string $which_color
798
+	 */
768 799
 	function SetGridColor ($which_color) {
769 800
 		$this->grid_color = $which_color;
770 801
 		$this->ndx_grid_color= $this->SetIndexColor($which_color);
@@ -997,6 +1028,12 @@  discard block
 block discarded – undo
997 1028
 		return true;
998 1029
 	}
999 1030
 
1031
+	/**
1032
+	 * @param string $x1
1033
+	 * @param string $y1
1034
+	 * @param string $x2
1035
+	 * @param string $y2
1036
+	 */
1000 1037
 	function SetPlotAreaPixels($x1,$y1,$x2,$y2) {
1001 1038
 		//Like in GD 0,0 is upper left
1002 1039
 		if (!$this->x_tot_margin) {
@@ -1017,6 +1054,12 @@  discard block
 block discarded – undo
1017 1054
 
1018 1055
 	}
1019 1056
 
1057
+	/**
1058
+	 * @param string $xmin
1059
+	 * @param string $ymin
1060
+	 * @param string $xmax
1061
+	 * @param string $ymax
1062
+	 */
1020 1063
 	function SetPlotAreaWorld($xmin,$ymin,$xmax,$ymax) {
1021 1064
 		if (($xmin == "")  && ($xmax == "")) {
1022 1065
 			//For automatic setting of data we need $this->max_x
@@ -1081,6 +1124,9 @@  discard block
 block discarded – undo
1081 1124
 		die;
1082 1125
 	}
1083 1126
 
1127
+	/**
1128
+	 * @param string $error_message
1129
+	 */
1084 1130
 	function DrawError($error_message) {
1085 1131
 	// prints the error message inline into
1086 1132
 	// the generated image
@@ -1208,6 +1254,9 @@  discard block
 block discarded – undo
1208 1254
 		return true;
1209 1255
 	}
1210 1256
 
1257
+	/**
1258
+	 * @param integer $which_ps
1259
+	 */
1211 1260
 	function SetPointSize($which_ps) {
1212 1261
 		//in pixels
1213 1262
 		SetType($which_ps,'integer');
@@ -1238,6 +1287,9 @@  discard block
 block discarded – undo
1238 1287
 	}
1239 1288
 
1240 1289
 //////////////COLORS
1290
+	/**
1291
+	 * @param string $which_color_array
1292
+	 */
1241 1293
 	function SetRGBArray ($which_color_array) { 
1242 1294
 		if ( is_array($which_color_array) ) { 
1243 1295
 			//User Defined Array
@@ -1333,6 +1385,10 @@  discard block
 block discarded – undo
1333 1385
 		return $ret_val;
1334 1386
 	}
1335 1387
 
1388
+	/**
1389
+	 * @param string[] $which_data
1390
+	 * @param string[] $which_border
1391
+	 */
1336 1392
 	function SetDataColors($which_data,$which_border) {
1337 1393
 		//Set the data to be displayed in a particular color
1338 1394
 		if (!$which_data) {
@@ -1833,6 +1889,9 @@  discard block
 block discarded – undo
1833 1889
 
1834 1890
 	}
1835 1891
 
1892
+	/**
1893
+	 * @param double $xpos
1894
+	 */
1836 1895
 	function DrawXDataLabel($xlab,$xpos) {
1837 1896
 		//xpos comes in in PIXELS not in world coordinates.
1838 1897
 		//Draw an x data label centered at xlab
@@ -2083,6 +2142,9 @@  discard block
 block discarded – undo
2083 2142
 
2084 2143
 	}  //function DrawThinBarLines
2085 2144
 
2145
+	/**
2146
+	 * @param string $error_bar_type
2147
+	 */
2086 2148
 	function DrawYErrorBar($x_world,$y_world,$error_height,$error_bar_type,$color) {
2087 2149
 		$x1 = $this->xtr($x_world);
2088 2150
 		$y1 = $this->ytr($y_world);
@@ -2105,6 +2167,9 @@  discard block
 block discarded – undo
2105 2167
 		return true;
2106 2168
 	}
2107 2169
 
2170
+	/**
2171
+	 * @param string $dot_type
2172
+	 */
2108 2173
 	function DrawDot($x_world,$y_world,$dot_type,$color) {
2109 2174
 		$half_point = $this->point_size / 2;
2110 2175
 		$x1 = $this->xtr($x_world) - $half_point;
@@ -2344,6 +2409,14 @@  discard block
 block discarded – undo
2344 2409
 		return false;
2345 2410
 	} //function DrawLineSeries
2346 2411
 
2412
+	/**
2413
+	 * @param double $x1pix
2414
+	 * @param double $y1pix
2415
+	 * @param double $x2pix
2416
+	 * @param double $y2pix
2417
+	 * @param integer $dash_length
2418
+	 * @param integer $dash_space
2419
+	 */
2347 2420
 	function DrawDashedLine($x1pix,$y1pix,$x2pix,$y2pix,$dash_length,$dash_space,$color) {
2348 2421
 		//Code based on work by Ariel Garza and James Pine
2349 2422
 		//I've decided to have this be in pixels only as a replacement for ImageLine
@@ -2434,6 +2507,11 @@  discard block
 block discarded – undo
2434 2507
 		}
2435 2508
 	} //function DrawBars
2436 2509
 
2510
+	/**
2511
+	 * @param string $which_x1
2512
+	 * @param string $which_y1
2513
+	 * @param string $which_boxtype
2514
+	 */
2437 2515
 	function DrawLegend($which_x1,$which_y1,$which_boxtype) {
2438 2516
 		//Base code submitted by Marlin Viss
2439 2517
 		$max_legend_length=0;
Please login to merge, or discard this patch.
catalog/admin/includes/classes/upload.php 1 patch
Doc Comments   +12 added lines patch added patch discarded remove patch
@@ -108,10 +108,16 @@  discard block
 block discarded – undo
108 108
       $this->file = $file;
109 109
     }
110 110
 
111
+    /**
112
+     * @param string $destination
113
+     */
111 114
     function set_destination($destination) {
112 115
       $this->destination = $destination;
113 116
     }
114 117
 
118
+    /**
119
+     * @param string $permissions
120
+     */
115 121
     function set_permissions($permissions) {
116 122
       $this->permissions = octdec($permissions);
117 123
     }
@@ -124,6 +130,9 @@  discard block
 block discarded – undo
124 130
       $this->tmp_filename = $filename;
125 131
     }
126 132
 
133
+    /**
134
+     * @param string $extensions
135
+     */
127 136
     function set_extensions($extensions) {
128 137
       if (tep_not_null($extensions)) {
129 138
         if (is_array($extensions)) {
@@ -160,6 +169,9 @@  discard block
 block discarded – undo
160 169
       }
161 170
     }
162 171
 
172
+    /**
173
+     * @param string $location
174
+     */
163 175
     function set_output_messages($location) {
164 176
       switch ($location) {
165 177
         case 'session':
Please login to merge, or discard this patch.
catalog/includes/classes/breadcrumb.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -21,6 +21,9 @@
 block discarded – undo
21 21
       $this->_trail = array();
22 22
     }
23 23
 
24
+    /**
25
+     * @param string $title
26
+     */
24 27
     function add($title, $link = '') {
25 28
       $this->_trail[] = array('title' => $title, 'link' => $link);
26 29
     }
Please login to merge, or discard this patch.
catalog/includes/classes/email.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -81,6 +81,7 @@  discard block
 block discarded – undo
81 81
  * it. This can then be given as the first
82 82
  * argument of the the functions
83 83
  * add_html_image() or add_attachment().
84
+ * @param string $filename
84 85
  */
85 86
 
86 87
     function get_file($filename) {
@@ -151,6 +152,7 @@  discard block
 block discarded – undo
151 152
  * Adds a html part to the mail.
152 153
  * Also replaces image names with
153 154
  * content-id's.
155
+ * @param string $text
154 156
  */
155 157
 
156 158
     function add_html($html, $text = NULL, $images_dir = NULL) {
@@ -163,6 +165,7 @@  discard block
 block discarded – undo
163 165
 /**
164 166
  * Adds an image to the list of embedded
165 167
  * images.
168
+ * @param string $file
166 169
  */
167 170
 
168 171
     function add_html_image($file, $name = '', $c_type='application/octet-stream') {
@@ -227,6 +230,7 @@  discard block
 block discarded – undo
227 230
 
228 231
 /**
229 232
  * Adds an alternative part to a mime_part object
233
+ * @param null|mime $obj
230 234
  */
231 235
 
232 236
     function add_alternative_part(&$obj) {
Please login to merge, or discard this patch.
catalog/includes/classes/http_client.php 1 patch
Doc Comments   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 /**
110 110
  * addHeader
111 111
  * set a unique request header
112
- * @param headerName the header name
112
+ * @param headerName string header name
113 113
  * @param headerValue the header value, ( unencoded)
114 114
  **/
115 115
     function addHeader($headerName, $headerValue) {
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 /**
120 120
  * removeHeader
121 121
  * unset a request header
122
- * @param headerName the header name
122
+ * @param headerName string header name
123 123
  **/
124 124
     function removeHeader($headerName) {
125 125
       unset($this->requestHeaders[$headerName]);
@@ -307,7 +307,8 @@  discard block
 block discarded – undo
307 307
  * a) the command
308 308
  * b) the request headers if they are defined
309 309
  * c) the request body if defined
310
- * @return string the server repsonse status code
310
+ * @param string $command
311
+ * @return boolean|null the server repsonse status code
311 312
  **/
312 313
     function sendCommand($command) {
313 314
       $this->responseHeaders = array();
@@ -430,7 +431,7 @@  discard block
 block discarded – undo
430 431
 /**
431 432
  * Calculate and return the URI to be sent ( proxy purpose )
432 433
  * @param the local URI
433
- * @return URI to be used in the HTTP request
434
+ * @return string to be used in the HTTP request
434 435
  * @scope private
435 436
  **/
436 437
     function makeUri($uri) {
Please login to merge, or discard this patch.
catalog/includes/classes/mime.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@
 block discarded – undo
145 145
  * @param $body   The body of the subpart, if any.
146 146
  * @param $params The parameters for the subpart, same
147 147
  *                as the $params argument for constructor.
148
- * @return A reference to the part you just added. It is
148
+ * @return mime reference to the part you just added. It is
149 149
  *         crucial if using multipart/* in your subparts that
150 150
  *         you use =& in your script when calling this function,
151 151
  *         otherwise you will not be able to add further subparts.
Please login to merge, or discard this patch.
catalog/includes/functions/password_funcs.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -13,6 +13,9 @@  discard block
 block discarded – undo
13 13
 ////
14 14
 // This function validates a plain text password with a
15 15
 // salted or phpass password
16
+  /**
17
+   * @param string $plain
18
+   */
16 19
   function tep_validate_password($plain, $encrypted) {
17 20
     if (tep_not_null($plain) && tep_not_null($encrypted)) {
18 21
       if (tep_password_type($encrypted) == 'salt') {
@@ -52,6 +55,9 @@  discard block
 block discarded – undo
52 55
 ////
53 56
 // This function encrypts a phpass password from a plaintext
54 57
 // password.
58
+  /**
59
+   * @param string $plain
60
+   */
55 61
   function tep_encrypt_password($plain) {
56 62
     if (!class_exists('PasswordHash')) {
57 63
       include(DIR_WS_CLASSES . 'passwordhash.php');
Please login to merge, or discard this patch.
catalog/includes/functions/specials.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -14,6 +14,9 @@
 block discarded – undo
14 14
 
15 15
 ////
16 16
 // Sets the status of a special product
17
+  /**
18
+   * @param integer $status
19
+   */
17 20
   function tep_set_specials_status($specials_id, $status) {
18 21
     $OSCOM_Db = Registry::get('Db');
19 22
 
Please login to merge, or discard this patch.