a426f1e2 by root

Changed something

1 parent bb6d7fbe
File mode changed
...@@ -29,7 +29,9 @@ class ApiController extends Controller ...@@ -29,7 +29,9 @@ class ApiController extends Controller
29 29
30 public function insert($json) 30 public function insert($json)
31 { 31 {
32 $json = '{"pdf":[{"name":"SISKINDS_test file","folder":"SISKINDS_test","pdfLocation":"https://www.polyu.edu.hk/iaee/files/pdf-sample.pdf"}],"changes":[{"label":"none","locationUp":"400","locationRight":90,"pages":"1","content":"LOGO_text_black.jpg","z-index":null,"idstylesPDF":1,"order":"2","style":null,"idchange_typePDF":2,"change_type":"2","fileLocation":"http://www.arielpremium.com/images/vsample_images/LOGO_text_black.jpg"},{"label":"text style","locationUp":"60","locationRight":290,"pages":"1","content":"519.660.2121 siskinds.com\/change","z-index":null,"idstylesPDF":2,"order":"1","style":"a:3:{s:11:\"font-family\";s:11:\"TradeGothic\";s:9:\"font-size\";s:2:\"14\";s:10:\"font-color\";s:14:\"cmyk 0 0 0.5 0\";}","idchange_typePDF":1,"change_type":"1"}]}'; 32
33
34 $json = '{"pdf":[{"name":"SISKINDS_test file","folder":"SISKINDS_test","pdfLocation":"https://www.ets.org/Media/Tests/GRE/pdf/gre_research_validity_data.pdf"}],"changes":[{"label":"none","locationUp":"400","locationRight":90,"pages":"1","content":"LOGO_text_black.jpg","z-index":null,"idstylesPDF":1,"order":"2","style":null,"idchange_typePDF":2,"change_type":"2","fileLocation":"http://www.arielpremium.com/images/vsample_images/LOGO_text_black.jpg"},{"label":"text style","locationUp":"60","locationRight":290,"pages":"1","content":"519.660.2121 siskinds.com\/change","z-index":null,"idstylesPDF":2,"order":"1","style":"a:3:{s:11:\"font-family\";s:11:\"TradeGothic\";s:9:\"font-size\";s:2:\"14\";s:10:\"font-color\";s:14:\"cmyk 0 0 0.5 0\";}","idchange_typePDF":1,"change_type":"1"}]}';
33 35
34 $apiCallId = new pdfModel(); 36 $apiCallId = new pdfModel();
35 $apiCallId = $apiCallId->addApiCall('1',$json); 37 $apiCallId = $apiCallId->addApiCall('1',$json);
......
...@@ -34,7 +34,7 @@ class PdfController extends Controller ...@@ -34,7 +34,7 @@ class PdfController extends Controller
34 $outfile=""; 34 $outfile="";
35 $title = "Test Pages"; 35 $title = "Test Pages";
36 $storagePath = Storage::disk('local')->getDriver()->getAdapter()->getPathPrefix(); 36 $storagePath = Storage::disk('local')->getDriver()->getAdapter()->getPathPrefix();
37 $outfile = $storagePath.$searchpath."/new_".$rows[0]->file; 37 // $outfile = $storagePath.$searchpath."/new_".$rows[0]->file;
38 38
39 try { 39 try {
40 40
...@@ -154,13 +154,13 @@ try { ...@@ -154,13 +154,13 @@ try {
154 154
155 /// To turn on pdf screen out put uncomment below lines and remove the text in $output="" Var 155 /// To turn on pdf screen out put uncomment below lines and remove the text in $output="" Var
156 156
157 //$buf = $p->get_buffer(); 157 $buf = $p->get_buffer();
158 //$len = strlen($buf); 158 $len = strlen($buf);
159 159
160 //header("Content-type: application/pdf"); 160 header("Content-type: application/pdf");
161 //header("Content-Length: $len"); 161 header("Content-Length: $len");
162 //header("Content-Disposition: inline; filename=test_pages.pdf"); 162 header("Content-Disposition: inline; filename=test_pages.pdf");
163 //print $buf; 163 print $buf;
164 164
165 165
166 166
......
...@@ -22,7 +22,7 @@ class pdfModel extends Model ...@@ -22,7 +22,7 @@ class pdfModel extends Model
22 ->join('changesPDF', 'PDF_idPDF', '=', 'idPDF') 22 ->join('changesPDF', 'PDF_idPDF', '=', 'idPDF')
23 ->join('stylesPDF', 'stylesPDF_idstylesPDF', '=', 'idstylesPDF') 23 ->join('stylesPDF', 'stylesPDF_idstylesPDF', '=', 'idstylesPDF')
24 ->join('change_typePDF', 'idchange_typePDF', '=', 'change_typePDF_idchange_typePDF') 24 ->join('change_typePDF', 'idchange_typePDF', '=', 'change_typePDF_idchange_typePDF')
25 ->where('pdf.idPDF','=', $id); 25 ->where('PDF.idPDF','=', $id);
26 26
27 27
28 return $rows; 28 return $rows;
...@@ -31,7 +31,7 @@ class pdfModel extends Model ...@@ -31,7 +31,7 @@ class pdfModel extends Model
31 31
32 public function getList($id){ 32 public function getList($id){
33 33
34 $rows = DB::table('PDF')->where('pdf.custId','=', $id); 34 $rows = DB::table('PDF')->where('PDF.custId','=', $id);
35 35
36 return $rows; 36 return $rows;
37 } 37 }
......
...@@ -11,7 +11,11 @@ ...@@ -11,7 +11,11 @@
11 "itbz/fpdf": "^1.7", 11 "itbz/fpdf": "^1.7",
12 "barryvdh/laravel-snappy": "^0.3.0", 12 "barryvdh/laravel-snappy": "^0.3.0",
13 "vsmoraes/laravel-pdf": "^1.0", 13 "vsmoraes/laravel-pdf": "^1.0",
14 "php-curl-class/php-curl-class": "^4.11" 14 "php-curl-class/php-curl-class": "^4.11",
15 "ext-PDO": "^7.0",
16 "ext-pdo_pgsql": "^7.0",
17 "slim/pdo": "^1.9",
18 "doctrine/dbal": "^2.5"
15 19
16 20
17 }, 21 },
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "hash": "abe644e54edc320b800ca93a07722164", 7 "hash": "bd5acf06527a71243b4914e1b34144ac",
8 "content-hash": "9140c04753fa3e303d5429f3845592a9", 8 "content-hash": "e5b082b079774eaef01edacb786fcf23",
9 "packages": [ 9 "packages": [
10 { 10 {
11 "name": "barryvdh/laravel-snappy", 11 "name": "barryvdh/laravel-snappy",
...@@ -147,6 +147,354 @@ ...@@ -147,6 +147,354 @@
147 "time": "2014-10-24 07:27:01" 147 "time": "2014-10-24 07:27:01"
148 }, 148 },
149 { 149 {
150 "name": "doctrine/annotations",
151 "version": "v1.2.7",
152 "source": {
153 "type": "git",
154 "url": "https://github.com/doctrine/annotations.git",
155 "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
156 },
157 "dist": {
158 "type": "zip",
159 "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
160 "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
161 "shasum": ""
162 },
163 "require": {
164 "doctrine/lexer": "1.*",
165 "php": ">=5.3.2"
166 },
167 "require-dev": {
168 "doctrine/cache": "1.*",
169 "phpunit/phpunit": "4.*"
170 },
171 "type": "library",
172 "extra": {
173 "branch-alias": {
174 "dev-master": "1.3.x-dev"
175 }
176 },
177 "autoload": {
178 "psr-0": {
179 "Doctrine\\Common\\Annotations\\": "lib/"
180 }
181 },
182 "notification-url": "https://packagist.org/downloads/",
183 "license": [
184 "MIT"
185 ],
186 "authors": [
187 {
188 "name": "Roman Borschel",
189 "email": "roman@code-factory.org"
190 },
191 {
192 "name": "Benjamin Eberlei",
193 "email": "kontakt@beberlei.de"
194 },
195 {
196 "name": "Guilherme Blanco",
197 "email": "guilhermeblanco@gmail.com"
198 },
199 {
200 "name": "Jonathan Wage",
201 "email": "jonwage@gmail.com"
202 },
203 {
204 "name": "Johannes Schmitt",
205 "email": "schmittjoh@gmail.com"
206 }
207 ],
208 "description": "Docblock Annotations Parser",
209 "homepage": "http://www.doctrine-project.org",
210 "keywords": [
211 "annotations",
212 "docblock",
213 "parser"
214 ],
215 "time": "2015-08-31 12:32:49"
216 },
217 {
218 "name": "doctrine/cache",
219 "version": "v1.6.0",
220 "source": {
221 "type": "git",
222 "url": "https://github.com/doctrine/cache.git",
223 "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6"
224 },
225 "dist": {
226 "type": "zip",
227 "url": "https://api.github.com/repos/doctrine/cache/zipball/f8af318d14bdb0eff0336795b428b547bd39ccb6",
228 "reference": "f8af318d14bdb0eff0336795b428b547bd39ccb6",
229 "shasum": ""
230 },
231 "require": {
232 "php": "~5.5|~7.0"
233 },
234 "conflict": {
235 "doctrine/common": ">2.2,<2.4"
236 },
237 "require-dev": {
238 "phpunit/phpunit": "~4.8|~5.0",
239 "predis/predis": "~1.0",
240 "satooshi/php-coveralls": "~0.6"
241 },
242 "type": "library",
243 "extra": {
244 "branch-alias": {
245 "dev-master": "1.6.x-dev"
246 }
247 },
248 "autoload": {
249 "psr-4": {
250 "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
251 }
252 },
253 "notification-url": "https://packagist.org/downloads/",
254 "license": [
255 "MIT"
256 ],
257 "authors": [
258 {
259 "name": "Roman Borschel",
260 "email": "roman@code-factory.org"
261 },
262 {
263 "name": "Benjamin Eberlei",
264 "email": "kontakt@beberlei.de"
265 },
266 {
267 "name": "Guilherme Blanco",
268 "email": "guilhermeblanco@gmail.com"
269 },
270 {
271 "name": "Jonathan Wage",
272 "email": "jonwage@gmail.com"
273 },
274 {
275 "name": "Johannes Schmitt",
276 "email": "schmittjoh@gmail.com"
277 }
278 ],
279 "description": "Caching library offering an object-oriented API for many cache backends",
280 "homepage": "http://www.doctrine-project.org",
281 "keywords": [
282 "cache",
283 "caching"
284 ],
285 "time": "2015-12-31 16:37:02"
286 },
287 {
288 "name": "doctrine/collections",
289 "version": "v1.3.0",
290 "source": {
291 "type": "git",
292 "url": "https://github.com/doctrine/collections.git",
293 "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a"
294 },
295 "dist": {
296 "type": "zip",
297 "url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
298 "reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
299 "shasum": ""
300 },
301 "require": {
302 "php": ">=5.3.2"
303 },
304 "require-dev": {
305 "phpunit/phpunit": "~4.0"
306 },
307 "type": "library",
308 "extra": {
309 "branch-alias": {
310 "dev-master": "1.2.x-dev"
311 }
312 },
313 "autoload": {
314 "psr-0": {
315 "Doctrine\\Common\\Collections\\": "lib/"
316 }
317 },
318 "notification-url": "https://packagist.org/downloads/",
319 "license": [
320 "MIT"
321 ],
322 "authors": [
323 {
324 "name": "Roman Borschel",
325 "email": "roman@code-factory.org"
326 },
327 {
328 "name": "Benjamin Eberlei",
329 "email": "kontakt@beberlei.de"
330 },
331 {
332 "name": "Guilherme Blanco",
333 "email": "guilhermeblanco@gmail.com"
334 },
335 {
336 "name": "Jonathan Wage",
337 "email": "jonwage@gmail.com"
338 },
339 {
340 "name": "Johannes Schmitt",
341 "email": "schmittjoh@gmail.com"
342 }
343 ],
344 "description": "Collections Abstraction library",
345 "homepage": "http://www.doctrine-project.org",
346 "keywords": [
347 "array",
348 "collections",
349 "iterator"
350 ],
351 "time": "2015-04-14 22:21:58"
352 },
353 {
354 "name": "doctrine/common",
355 "version": "v2.6.1",
356 "source": {
357 "type": "git",
358 "url": "https://github.com/doctrine/common.git",
359 "reference": "a579557bc689580c19fee4e27487a67fe60defc0"
360 },
361 "dist": {
362 "type": "zip",
363 "url": "https://api.github.com/repos/doctrine/common/zipball/a579557bc689580c19fee4e27487a67fe60defc0",
364 "reference": "a579557bc689580c19fee4e27487a67fe60defc0",
365 "shasum": ""
366 },
367 "require": {
368 "doctrine/annotations": "1.*",
369 "doctrine/cache": "1.*",
370 "doctrine/collections": "1.*",
371 "doctrine/inflector": "1.*",
372 "doctrine/lexer": "1.*",
373 "php": "~5.5|~7.0"
374 },
375 "require-dev": {
376 "phpunit/phpunit": "~4.8|~5.0"
377 },
378 "type": "library",
379 "extra": {
380 "branch-alias": {
381 "dev-master": "2.7.x-dev"
382 }
383 },
384 "autoload": {
385 "psr-4": {
386 "Doctrine\\Common\\": "lib/Doctrine/Common"
387 }
388 },
389 "notification-url": "https://packagist.org/downloads/",
390 "license": [
391 "MIT"
392 ],
393 "authors": [
394 {
395 "name": "Roman Borschel",
396 "email": "roman@code-factory.org"
397 },
398 {
399 "name": "Benjamin Eberlei",
400 "email": "kontakt@beberlei.de"
401 },
402 {
403 "name": "Guilherme Blanco",
404 "email": "guilhermeblanco@gmail.com"
405 },
406 {
407 "name": "Jonathan Wage",
408 "email": "jonwage@gmail.com"
409 },
410 {
411 "name": "Johannes Schmitt",
412 "email": "schmittjoh@gmail.com"
413 }
414 ],
415 "description": "Common Library for Doctrine projects",
416 "homepage": "http://www.doctrine-project.org",
417 "keywords": [
418 "annotations",
419 "collections",
420 "eventmanager",
421 "persistence",
422 "spl"
423 ],
424 "time": "2015-12-25 13:18:31"
425 },
426 {
427 "name": "doctrine/dbal",
428 "version": "v2.5.4",
429 "source": {
430 "type": "git",
431 "url": "https://github.com/doctrine/dbal.git",
432 "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769"
433 },
434 "dist": {
435 "type": "zip",
436 "url": "https://api.github.com/repos/doctrine/dbal/zipball/abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
437 "reference": "abbdfd1cff43a7b99d027af3be709bc8fc7d4769",
438 "shasum": ""
439 },
440 "require": {
441 "doctrine/common": ">=2.4,<2.7-dev",
442 "php": ">=5.3.2"
443 },
444 "require-dev": {
445 "phpunit/phpunit": "4.*",
446 "symfony/console": "2.*"
447 },
448 "suggest": {
449 "symfony/console": "For helpful console commands such as SQL execution and import of files."
450 },
451 "bin": [
452 "bin/doctrine-dbal"
453 ],
454 "type": "library",
455 "extra": {
456 "branch-alias": {
457 "dev-master": "2.5.x-dev"
458 }
459 },
460 "autoload": {
461 "psr-0": {
462 "Doctrine\\DBAL\\": "lib/"
463 }
464 },
465 "notification-url": "https://packagist.org/downloads/",
466 "license": [
467 "MIT"
468 ],
469 "authors": [
470 {
471 "name": "Roman Borschel",
472 "email": "roman@code-factory.org"
473 },
474 {
475 "name": "Benjamin Eberlei",
476 "email": "kontakt@beberlei.de"
477 },
478 {
479 "name": "Guilherme Blanco",
480 "email": "guilhermeblanco@gmail.com"
481 },
482 {
483 "name": "Jonathan Wage",
484 "email": "jonwage@gmail.com"
485 }
486 ],
487 "description": "Database Abstraction Layer",
488 "homepage": "http://www.doctrine-project.org",
489 "keywords": [
490 "database",
491 "dbal",
492 "persistence",
493 "queryobject"
494 ],
495 "time": "2016-01-05 22:11:12"
496 },
497 {
150 "name": "doctrine/inflector", 498 "name": "doctrine/inflector",
151 "version": "v1.1.0", 499 "version": "v1.1.0",
152 "source": { 500 "source": {
...@@ -214,6 +562,60 @@ ...@@ -214,6 +562,60 @@
214 "time": "2015-11-06 14:35:42" 562 "time": "2015-11-06 14:35:42"
215 }, 563 },
216 { 564 {
565 "name": "doctrine/lexer",
566 "version": "v1.0.1",
567 "source": {
568 "type": "git",
569 "url": "https://github.com/doctrine/lexer.git",
570 "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
571 },
572 "dist": {
573 "type": "zip",
574 "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
575 "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
576 "shasum": ""
577 },
578 "require": {
579 "php": ">=5.3.2"
580 },
581 "type": "library",
582 "extra": {
583 "branch-alias": {
584 "dev-master": "1.0.x-dev"
585 }
586 },
587 "autoload": {
588 "psr-0": {
589 "Doctrine\\Common\\Lexer\\": "lib/"
590 }
591 },
592 "notification-url": "https://packagist.org/downloads/",
593 "license": [
594 "MIT"
595 ],
596 "authors": [
597 {
598 "name": "Roman Borschel",
599 "email": "roman@code-factory.org"
600 },
601 {
602 "name": "Guilherme Blanco",
603 "email": "guilhermeblanco@gmail.com"
604 },
605 {
606 "name": "Johannes Schmitt",
607 "email": "schmittjoh@gmail.com"
608 }
609 ],
610 "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
611 "homepage": "http://www.doctrine-project.org",
612 "keywords": [
613 "lexer",
614 "parser"
615 ],
616 "time": "2014-09-09 13:34:57"
617 },
618 {
217 "name": "dompdf/dompdf", 619 "name": "dompdf/dompdf",
218 "version": "v0.6.2", 620 "version": "v0.6.2",
219 "source": { 621 "source": {
...@@ -1175,6 +1577,52 @@ ...@@ -1175,6 +1577,52 @@
1175 "time": "2016-03-09 05:03:14" 1577 "time": "2016-03-09 05:03:14"
1176 }, 1578 },
1177 { 1579 {
1580 "name": "slim/pdo",
1581 "version": "1.9.8",
1582 "source": {
1583 "type": "git",
1584 "url": "https://github.com/FaaPz/Slim-PDO.git",
1585 "reference": "5f766ca63b8a8e45e7a27acaa3edadb1cf5e55a8"
1586 },
1587 "dist": {
1588 "type": "zip",
1589 "url": "https://api.github.com/repos/FaaPz/Slim-PDO/zipball/5f766ca63b8a8e45e7a27acaa3edadb1cf5e55a8",
1590 "reference": "5f766ca63b8a8e45e7a27acaa3edadb1cf5e55a8",
1591 "shasum": ""
1592 },
1593 "require": {
1594 "ext-pdo": "*",
1595 "php": ">=5.3.0"
1596 },
1597 "type": "library",
1598 "autoload": {
1599 "psr-4": {
1600 "Slim\\PDO\\": "src/PDO/"
1601 }
1602 },
1603 "notification-url": "https://packagist.org/downloads/",
1604 "license": [
1605 "MIT"
1606 ],
1607 "authors": [
1608 {
1609 "name": "Fabian de Laender",
1610 "email": "fabian@faapz.nl",
1611 "homepage": "http://faapz.nl",
1612 "role": "Developer"
1613 }
1614 ],
1615 "description": "PDO database library for Slim Framework",
1616 "homepage": "https://github.com/FaaPz/Slim-PDO",
1617 "keywords": [
1618 "database",
1619 "framework",
1620 "pdo",
1621 "slim"
1622 ],
1623 "time": "2016-02-27 16:38:28"
1624 },
1625 {
1178 "name": "swiftmailer/swiftmailer", 1626 "name": "swiftmailer/swiftmailer",
1179 "version": "v5.4.1", 1627 "version": "v5.4.1",
1180 "source": { 1628 "source": {
...@@ -3423,7 +3871,9 @@ ...@@ -3423,7 +3871,9 @@
3423 "prefer-stable": false, 3871 "prefer-stable": false,
3424 "prefer-lowest": false, 3872 "prefer-lowest": false,
3425 "platform": { 3873 "platform": {
3426 "php": ">=5.5.9" 3874 "php": ">=5.5.9",
3875 "ext-pdo": "^7.0",
3876 "ext-pdo_pgsql": "^7.0"
3427 }, 3877 },
3428 "platform-dev": [] 3878 "platform-dev": []
3429 } 3879 }
......
...@@ -108,7 +108,7 @@ return [ ...@@ -108,7 +108,7 @@ return [
108 | 108 |
109 */ 109 */
110 110
111 'log' => env('APP_LOG', 'single'), 111 'log' => env('APP_LOG', 'single'),
112 112
113 /* 113 /*
114 |-------------------------------------------------------------------------- 114 |--------------------------------------------------------------------------
......
1 html>
2 <head>
3 <title>www.nginxsite.com</title>
4 </head>
5 <body>
6 <h1>Success! Nginx is properly serving on this domain!</h1>
7 </body>
8 </html>
1 <?php echo "hello world";
2
3
4 ?>
...@@ -46,7 +46,6 @@ $app = require_once __DIR__.'/../bootstrap/app.php'; ...@@ -46,7 +46,6 @@ $app = require_once __DIR__.'/../bootstrap/app.php';
46 | and wonderful application we have prepared for them. 46 | and wonderful application we have prepared for them.
47 | 47 |
48 */ 48 */
49
50 $kernel = $app->make(Illuminate\Contracts\Http\Kernel::class); 49 $kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
51 50
52 $response = $kernel->handle( 51 $response = $kernel->handle(
......