Merge pull request #1 from friendica/master

Update this fork

5 files changed, 127 insertions, 0 deletions

diff --git a/library/phpqrcode/tools/merge.bat b/library/phpqrcode/tools/merge.bat
new file mode 100644
index 000000000..b60a4853c
--- /dev/null
+++ b/library/phpqrcode/tools/merge.bat
@@ -0,0 +1,2 @@
+php ./merge.php

+pause
\ No newline at end of file
diff --git a/library/phpqrcode/tools/merge.php b/library/phpqrcode/tools/merge.php
new file mode 100644
index 000000000..19d338b34
--- /dev/null
+++ b/library/phpqrcode/tools/merge.php
@@ -0,0 +1,70 @@
+<?php

+

+/*

+ * PHP QR Code encoder

+ *

+ * Tool for merging all library files into one, simpler to incorporate.

+ * 

+ * MAKE SURE THAT RESULTING PHPQRCode.php (and its dir) ARE WRITABLE!

+ *

+ * PHP QR Code is distributed under LGPL 3

+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 3 of the License, or any later version.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

+ */

+ 

+    $QR_BASEDIR = dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;

+    $QR_TOOLSDIR = dirname(__FILE__).DIRECTORY_SEPARATOR;

+    

+    $outputFile = $QR_BASEDIR.'phpqrcode.php';

+    

+    // Required libs

+    

+    $fileList = array(

+        $QR_BASEDIR.'qrconst.php',

+        $QR_TOOLSDIR.'merged_config.php',

+        $QR_BASEDIR.'qrtools.php',

+        $QR_BASEDIR.'qrspec.php',

+        $QR_BASEDIR.'qrimage.php',

+        $QR_BASEDIR.'qrinput.php',

+        $QR_BASEDIR.'qrbitstream.php',

+        $QR_BASEDIR.'qrsplit.php',

+        $QR_BASEDIR.'qrrscode.php',

+        $QR_BASEDIR.'qrmask.php',

+        $QR_BASEDIR.'qrencode.php'

+    );

+    

+    $headerFile = $QR_TOOLSDIR.'merged_header.php';

+    $versionFile = $QR_BASEDIR.'VERSION';

+    

+    $outputCode = '';

+    

+    foreach($fileList as $fileName) {

+        $outputCode .= "\n\n".'//---- '.basename($fileName).' -----------------------------'."\n\n";

+        $anotherCode = file_get_contents($fileName);

+        $anotherCode = preg_replace ('/^<\?php/', '', $anotherCode);

+        $anotherCode = preg_replace ('/\?>\*$/', '', $anotherCode);

+        $outputCode .= "\n\n".$anotherCode."\n\n";

+    }

+    

+	$versionDataEx = explode("\n", file_get_contents($versionFile));

+	

+    $outputContents = file_get_contents($headerFile);

+    $outputContents .= "\n\n/*\n * Version: ".trim($versionDataEx[0])."\n * Build: ".trim($versionDataEx[1])."\n */\n\n";

+    $outputContents .= $outputCode;

+    

+    file_put_contents($outputFile, $outputContents);

+    

+    
\ No newline at end of file
diff --git a/library/phpqrcode/tools/merge.sh b/library/phpqrcode/tools/merge.sh
new file mode 100644
index 000000000..e4c2fbcb8
--- /dev/null
+++ b/library/phpqrcode/tools/merge.sh
@@ -0,0 +1,2 @@
+#!/bin/sh

+php ./merge.php
\ No newline at end of file
diff --git a/library/phpqrcode/tools/merged_config.php b/library/phpqrcode/tools/merged_config.php
new file mode 100644
index 000000000..55ddb4506
--- /dev/null
+++ b/library/phpqrcode/tools/merged_config.php
@@ -0,0 +1,17 @@
+<?php

+/*

+ * PHP QR Code encoder

+ *

+ * Config file, tuned-up for merged verion

+ */

+     

+    define('QR_CACHEABLE', false);       // use cache - more disk reads but less CPU power, masks and format templates are stored there

+    define('QR_CACHE_DIR', false);       // used when QR_CACHEABLE === true

+    define('QR_LOG_DIR', false);         // default error logs dir   

+    

+    define('QR_FIND_BEST_MASK', true);                                                          // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code

+    define('QR_FIND_FROM_RANDOM', 2);                                                       // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly

+    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false

+                                                  

+    define('QR_PNG_MAXIMUM_SIZE',  1024);                                                       // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images

+                                                  
\ No newline at end of file
diff --git a/library/phpqrcode/tools/merged_header.php b/library/phpqrcode/tools/merged_header.php
new file mode 100644
index 000000000..25805e564
--- /dev/null
+++ b/library/phpqrcode/tools/merged_header.php
@@ -0,0 +1,36 @@
+<?php

+

+/*

+ * PHP QR Code encoder

+ *

+ * This file contains MERGED version of PHP QR Code library.

+ * It was auto-generated from full version for your convenience.

+ *

+ * This merged version was configured to not requre any external files,

+ * with disabled cache, error loging and weker but faster mask matching.

+ * If you need tune it up please use non-merged version.

+ *

+ * For full version, documentation, examples of use please visit:

+ *

+ *    http://phpqrcode.sourceforge.net/

+ *    https://sourceforge.net/projects/phpqrcode/

+ *

+ * PHP QR Code is distributed under LGPL 3

+ * Copyright (C) 2010 Dominik Dzienia <deltalab at poczta dot fm>

+ *

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 3 of the License, or any later version.

+ *

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

+ */

+ 

+ 
\ No newline at end of file