sundbp
1/7/2013 - 7:08 PM

the-diff

Only in current.lloyd/: check-autorsync.test
diff -r -x .git -w current.lloyd/public_html/admin/addfolder.php current.sundbp/public_html/admin/addfolder.php
16c16,18
< $mysqli->query("INSERT INTO library_folders (id,client,name,parent,added) VALUES (NULL,$clientid,'$name',0,NOW())");
---
> $mysqli->query("INSERT INTO library_folders (
>     listing, id,client,name,parent,added) VALUES (
>     0,NULL, $clientid,'$name',0,NOW())");
diff -r -x .git -w current.lloyd/public_html/admin/dnload.php current.sundbp/public_html/admin/dnload.php
3c3
< require_once '../config.inc.php';
---
> require_once "../config.inc.php";
diff -r -x .git -w current.lloyd/public_html/admin/index.php current.sundbp/public_html/admin/index.php
6d5
< 
65c64
<        "order by listing asc";
---
>        "order by f.listing, c.companyname,f.name,f.added";
74d72
< 
79d76
< 
Only in current.sundbp/public_html/admin: .index.php.swp
diff -r -x .git -w current.lloyd/public_html/admin/repo.php current.sundbp/public_html/admin/repo.php
3,4c3,4
< require_once '../config.inc.php';
< require_once '../lib/lookups.inc.php';
---
> require_once "../config.inc.php";
> require_once "../lib/lookups.inc.php";
diff -r -x .git -w current.lloyd/public_html/contribute/taskcomments.php current.sundbp/public_html/contribute/taskcomments.php
3,5c3,5
< require_once '../auth.inc.php';
< require_once '../lib/lookups.inc.php';
< require_once '../lib/ooffice/utils.inc.php';
---
> require_once "../auth.inc.php";
> require_once "../lib/lookups.inc.php";
> require_once "../lib/ooffice/utils.inc.php";
10,11c10
< function findStyleFile($sid,$type)
< {
---
> function findStyleFile($sid,$type) {
17d15
< 
22d19
< 
64a62
> 
diff -r -x .git -w current.lloyd/public_html/contribute/taskdata.php current.sundbp/public_html/contribute/taskdata.php
3,5c3,5
< require_once '../auth.inc.php';
< require_once '../lib/lookups.inc.php';
< require_once '../lib/ooffice/utils.inc.php';
---
> require_once "../auth.inc.php";
> require_once "../lib/lookups.inc.php";
> require_once "../lib/ooffice/utils.inc.php";
81a82
> 
diff -r -x .git -w current.lloyd/public_html/lib/AssemblePack.class.php current.sundbp/public_html/lib/AssemblePack.class.php
14c14
< require_once 'ooffice/OpenDocument.class.php';
---
> require_once "ooffice/OpenDocument.class.php";
17,18c17
< function widthForStringUsingFontSize($string, $font, $fontSize)
< {
---
> function widthForStringUsingFontSize($string, $font, $fontSize) {
27d25
< 
31,32c29,30
< class PackAssembler
< {
---
> class PackAssembler {
> 
79,80c77
<   public function __construct($packObj, $agendaObj, $stylePath, $datadir, $commentarydir)
<   {
---
>   public function __construct($packObj, $agendaObj, $stylePath, $datadir, $commentarydir) {
90,91c87
<   public function init()
<   {
---
>   public function init() {
98,99c94
<   public function assemble($outputfile)
<   {
---
>   public function assemble($outputfile) {
135,136c130
<   private function findStyleFile($type)
<   {
---
>   private function findStyleFile($type) {
142d135
< 
147d139
< 
152,153c144
<   private function initPageRanges()
<   {
---
>   private function initPageRanges() {
216,217c207
<   private function initStyles()
<   {
---
>   private function initStyles() {
252,253c242
<   private function doSectionContents()
<   {
---
>   private function doSectionContents() {
268,269c257
<   private function doAgenda()
<   {
---
>   private function doAgenda() {
284,285c272
<   private function doImportPages($filepath)
<   {
---
>   private function doImportPages($filepath) {
294,295c281
<   private function importPage($pdfpage)
<   {
---
>   private function importPage($pdfpage) {
366d351
< 
370,371c355
<   public function getSectionFromId($sectionid)
<   {
---
>   public function getSectionFromId($sectionid) {
375d358
< 
378,379c361
<   public function getPageFromId($pageid)
<   {
---
>   public function getPageFromId($pageid) {
385d366
< 
394,395c375
<   private function buildContentsPDF($sectionid)
<   {
---
>   private function buildContentsPDF($sectionid) {
444d423
< 
453,454c432
<   private function addContentsToPage($newpage, $sectionid)
<   {
---
>   private function addContentsToPage($newpage, $sectionid) {
513d490
< 
517,518c494
<   public function isAgendaIncluded()
<   {
---
>   public function isAgendaIncluded() {
521d496
< 
529,530c504
<   private function buildAgendaPDF()
<   {
---
>   private function buildAgendaPDF() {
571d544
< 
580,581c553
<   private function addAgendaToPage($newpage)
<   {
---
>   private function addAgendaToPage($newpage) {
650d621
< 
657,658c628
<   private function buildCoverPDF()
<   {
---
>   private function buildCoverPDF() {
704d673
< 
709,710c678
<   private function doCover()
<   {
---
>   private function doCover() {
725a694
> 
diff -r -x .git -w current.lloyd/public_html/lib/GhostscriptConvert.php current.sundbp/public_html/lib/GhostscriptConvert.php
49d48
< 
52a52
> 
diff -r -x .git -w current.lloyd/public_html/lib/library.inc.php current.sundbp/public_html/lib/library.inc.php
3,4c3,4
< function publish_pack_to_library($packObj, $authorUser)
< {
---
> 
> function publish_pack_to_library($packObj, $authorUser) {
diff -r -x .git -w current.lloyd/public_html/lib/PasswordManager.php current.sundbp/public_html/lib/PasswordManager.php
52d51
< 
105a105
> 
diff -r -x .git -w current.lloyd/public_html/lib/RouteAuth.php current.sundbp/public_html/lib/RouteAuth.php
19d18
< 
36a36,37
> 
> 
diff -r -x .git -w current.lloyd/public_html/localconfig.inc.php current.sundbp/public_html/localconfig.inc.php
3c3
< $BASE_DIR     = "/boardiq";
---
>   $BASE_DIR     = "/boardiq/current";
diff -r -x .git -w current.lloyd/templates/admin/index.tpl current.sundbp/templates/admin/index.tpl
30c30
< <tr><th>Listing</th><th>Client</th><th>Shelf Name</th><th>Date Added</th></tr>
---
> <tr><th>Order</th><th>Client</th><th>Shelf Name</th><th>Date Added</th></tr>
Only in current.lloyd/: test.php
Only in current.lloyd/: .vagrant