@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | * |
65 | 65 | * 以下のものは非対応 |
66 | 66 | * BITMAPV4HEADER と BITMAPV5HEADER に含まれる色空間に関する様々な機能 |
67 | - * @param $filename_or_stream_or_binary |
|
67 | + * @param string $filename_or_stream_or_binary |
|
68 | 68 | * @return bool|resource |
69 | 69 | */ |
70 | 70 | |
@@ -96,6 +96,9 @@ discard block |
||
96 | 96 | return $bmp; |
97 | 97 | } |
98 | 98 | |
99 | + /** |
|
100 | + * @param string $str |
|
101 | + */ |
|
99 | 102 | public static function loadFromString($str){ |
100 | 103 | //data scheme より古いバージョンから対応しているようなので php://memory を使う |
101 | 104 | $fp = fopen("php://memory", "r+b"); |
@@ -119,6 +122,9 @@ discard block |
||
119 | 122 | return $bmp; |
120 | 123 | } |
121 | 124 | |
125 | + /** |
|
126 | + * @param resource $stream |
|
127 | + */ |
|
122 | 128 | public static function loadFromStream($stream){ |
123 | 129 | $buf = fread($stream, 14); //2+4+2+2+4 |
124 | 130 | if ($buf === false){ |
@@ -7,10 +7,9 @@ |
||
7 | 7 | */ |
8 | 8 | namespace PH7; |
9 | 9 | |
10 | -use |
|
11 | -PH7\Framework\Navigation\Page, |
|
12 | -PH7\Framework\Url\Header, |
|
13 | -PH7\Framework\Mvc\Router\Uri; |
|
10 | +use PH7\Framework\Navigation\Page; |
|
11 | +use PH7\Framework\Url\Header; |
|
12 | +use PH7\Framework\Mvc\Router\Uri; |
|
14 | 13 | |
15 | 14 | class SettingController extends Controller |
16 | 15 | { |
@@ -7,10 +7,9 @@ |
||
7 | 7 | */ |
8 | 8 | namespace PH7; |
9 | 9 | |
10 | -use |
|
11 | -PH7\Framework\Mvc\Router\Uri, |
|
12 | -PH7\Framework\Mvc\Model\DbConfig, |
|
13 | -PH7\Framework\Mvc\Model\Module as ModuleModel; |
|
10 | +use PH7\Framework\Mvc\Router\Uri; |
|
11 | +use PH7\Framework\Mvc\Model\DbConfig; |
|
12 | +use PH7\Framework\Mvc\Model\Module as ModuleModel; |
|
14 | 13 | |
15 | 14 | class DisableModuleForm |
16 | 15 | { |
@@ -67,6 +67,9 @@ discard block |
||
67 | 67 | \PFBC\Form::setSuccess('form_add_fake_profiles', nt('%n% user has successfully been added.', '%n% users have successfully been added.', $this->getUserNumber())); |
68 | 68 | } |
69 | 69 | |
70 | + /** |
|
71 | + * @return integer |
|
72 | + */ |
|
70 | 73 | protected function getUserNumber() |
71 | 74 | { |
72 | 75 | return $this->httpRequest->post('num'); |
@@ -98,7 +101,7 @@ discard block |
||
98 | 101 | * @param string $sApiParms Parameters to send to the API. |
99 | 102 | * @param string $sApiVersion Version of the API it will use. If fails from the API server, it will ignore it. |
100 | 103 | * |
101 | - * @return void |
|
104 | + * @return string |
|
102 | 105 | */ |
103 | 106 | private function getApiResults($sApiUrl, $sApiParms, $sApiVersion) |
104 | 107 | { |
@@ -12,11 +12,10 @@ |
||
12 | 12 | |
13 | 13 | defined('PH7') or exit('Restricted access'); |
14 | 14 | |
15 | -use |
|
16 | -PH7\Framework\Url\Url, |
|
17 | -PH7\Framework\Geo\Misc\Country, |
|
18 | -PH7\Framework\Security\Validate\Validate, |
|
19 | -PH7\Framework\Ip\Ip; |
|
15 | +use PH7\Framework\Url\Url; |
|
16 | +use PH7\Framework\Geo\Misc\Country; |
|
17 | +use PH7\Framework\Security\Validate\Validate; |
|
18 | +use PH7\Framework\Ip\Ip; |
|
20 | 19 | |
21 | 20 | /** Reset the time limit and increase the memory **/ |
22 | 21 | @set_time_limit(0); |
@@ -7,7 +7,8 @@ |
||
7 | 7 | */ |
8 | 8 | namespace PH7; |
9 | 9 | |
10 | -use PH7\Framework\Url\Header, PH7\Framework\Mvc\Router\Uri; |
|
10 | +use PH7\Framework\Url\Header; |
|
11 | +use PH7\Framework\Mvc\Router\Uri; |
|
11 | 12 | |
12 | 13 | class AccountController extends Controller |
13 | 14 | { |
@@ -9,10 +9,9 @@ |
||
9 | 9 | */ |
10 | 10 | namespace PH7; |
11 | 11 | |
12 | -use |
|
13 | -PH7\Framework\Navigation\Page, |
|
14 | -PH7\Framework\Url\Header, |
|
15 | -PH7\Framework\Mvc\Router\Uri; |
|
12 | +use PH7\Framework\Navigation\Page; |
|
13 | +use PH7\Framework\Url\Header; |
|
14 | +use PH7\Framework\Mvc\Router\Uri; |
|
16 | 15 | |
17 | 16 | class AdminController extends Controller |
18 | 17 | { |
@@ -8,7 +8,8 @@ |
||
8 | 8 | namespace PH7; |
9 | 9 | defined('PH7') or exit('Restricted access'); |
10 | 10 | |
11 | -use PH7\Framework\Cache\Cache, PH7\Framework\Mvc\Request\Http; |
|
11 | +use PH7\Framework\Cache\Cache; |
|
12 | +use PH7\Framework\Mvc\Request\Http; |
|
12 | 13 | |
13 | 14 | class EditFormProcess extends Form |
14 | 15 | { |
@@ -9,10 +9,9 @@ |
||
9 | 9 | |
10 | 10 | defined('PH7') or die('Restricted access'); |
11 | 11 | |
12 | -use |
|
13 | -PH7\Framework\Layout\Html\Design, |
|
14 | -PH7\Framework\Mvc\Router\Uri, |
|
15 | -PH7\Framework\Url\Header; |
|
12 | +use PH7\Framework\Layout\Html\Design; |
|
13 | +use PH7\Framework\Mvc\Router\Uri; |
|
14 | +use PH7\Framework\Url\Header; |
|
16 | 15 | |
17 | 16 | class Permission extends PermissionCore |
18 | 17 | { |
@@ -7,7 +7,8 @@ |
||
7 | 7 | */ |
8 | 8 | namespace PH7; |
9 | 9 | |
10 | -use PH7\Framework\Mvc\Router\Uri, PH7\Framework\Url\Header; |
|
10 | +use PH7\Framework\Mvc\Router\Uri; |
|
11 | +use PH7\Framework\Url\Header; |
|
11 | 12 | |
12 | 13 | class AdminController extends MainController |
13 | 14 | { |