瀏覽代碼

WhitespaceClean-resources/others

whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
mafoo 9 年之前
父節點
當前提交
f525ab24bd

+ 12 - 12
resources/calendar_lw_layers.js

@@ -3,7 +3,7 @@
 //	email :	[email protected]
 //	email :	[email protected]
 
 
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
-// Layers 
+// Layers
 //////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////
 
 
 var layerQueue=new Array()
 var layerQueue=new Array()
@@ -21,22 +21,22 @@ function hideElement( elmID, overDiv )
 	  {
 	  {
 		continue;
 		continue;
 	  }
 	  }
-  
+
 	  // Find the element's offsetTop and offsetLeft relative to the BODY tag.
 	  // Find the element's offsetTop and offsetLeft relative to the BODY tag.
 	  objLeft   = obj.offsetLeft;
 	  objLeft   = obj.offsetLeft;
 	  objTop    = obj.offsetTop;
 	  objTop    = obj.offsetTop;
 	  objParent = obj.offsetParent;
 	  objParent = obj.offsetParent;
-	  
+
 	  while( objParent.tagName.toUpperCase() != "BODY" )
 	  while( objParent.tagName.toUpperCase() != "BODY" )
 	  {
 	  {
 		objLeft  += objParent.offsetLeft;
 		objLeft  += objParent.offsetLeft;
 		objTop   += objParent.offsetTop;
 		objTop   += objParent.offsetTop;
 		objParent = objParent.offsetParent;
 		objParent = objParent.offsetParent;
 	  }
 	  }
-  
+
 	  objHeight = obj.offsetHeight;
 	  objHeight = obj.offsetHeight;
 	  objWidth = obj.offsetWidth;
 	  objWidth = obj.offsetWidth;
-  
+
 	  if(( overDiv.offsetLeft + overDiv.offsetWidth ) <= objLeft );
 	  if(( overDiv.offsetLeft + overDiv.offsetWidth ) <= objLeft );
 	  else if(( overDiv.offsetTop + overDiv.offsetHeight ) <= objTop );
 	  else if(( overDiv.offsetTop + overDiv.offsetHeight ) <= objTop );
 	  else if( overDiv.offsetTop >= ( objTop + objHeight ));
 	  else if( overDiv.offsetTop >= ( objTop + objHeight ));
@@ -48,7 +48,7 @@ function hideElement( elmID, overDiv )
 	}
 	}
   }
   }
 }
 }
- 
+
 /*
 /*
 * unhides <select> and <applet> objects (for IE only)
 * unhides <select> and <applet> objects (for IE only)
 */
 */
@@ -59,12 +59,12 @@ function showElement( elmID )
 	for( i = 0; i < document.getElementsByTagName( elmID ).length; i++ )
 	for( i = 0; i < document.getElementsByTagName( elmID ).length; i++ )
 	{
 	{
 	  obj = document.getElementsByTagName( elmID )[i];
 	  obj = document.getElementsByTagName( elmID )[i];
-	  
+
 	  if( !obj || !obj.offsetParent )
 	  if( !obj || !obj.offsetParent )
 	  {
 	  {
 		continue;
 		continue;
 	  }
 	  }
-	
+
 	  obj.style.visibility = "";
 	  obj.style.visibility = "";
 	}
 	}
   }
   }
@@ -96,7 +96,7 @@ function lw_showLayer (layerName) {
 
 
 		hideElement( 'SELECT', document.getElementById(layerName) );
 		hideElement( 'SELECT', document.getElementById(layerName) );
 		hideElement( 'APPLET', document.getElementById(layerName) );
 		hideElement( 'APPLET', document.getElementById(layerName) );
-	}	
+	}
 }
 }
 
 
 function lw_hideLayer () {
 function lw_hideLayer () {
@@ -120,11 +120,11 @@ function lw_hideLayerName (layerName) {
 	{
 	{
 		if ((layerQueue[i]!="")&&(layerQueue[i]!=layerName))
 		if ((layerQueue[i]!="")&&(layerQueue[i]!=layerName))
 		{
 		{
-			tmpQueue [++newIndex] = layerQueue[i]			
+			tmpQueue [++newIndex] = layerQueue[i]
 			hideElement( 'SELECT', document.getElementById(layerQueue[i]) );
 			hideElement( 'SELECT', document.getElementById(layerQueue[i]) );
 			hideElement( 'APPLET', document.getElementById(layerQueue[i]) );
 			hideElement( 'APPLET', document.getElementById(layerQueue[i]) );
 		}
 		}
-		
+
 	}
 	}
 
 
 	layerQueue = tmpQueue
 	layerQueue = tmpQueue
@@ -161,7 +161,7 @@ function lw_escLayer (e) {
 	else
 	else
 	if ((event.keyCode==0)||(event.keyCode==27))
 	if ((event.keyCode==0)||(event.keyCode==27))
 	{
 	{
-		lw_closeLastLayer()		
+		lw_closeLastLayer()
 	}
 	}
 }
 }
 
 

+ 28 - 28
resources/calendar_lw_menu.js

@@ -55,32 +55,32 @@ var nNowAt = 0
 
 
 function displayMenuItem(menuId) {
 function displayMenuItem(menuId) {
 	var sHTML
 	var sHTML
-	
+
 	if (menu[menuId].parentId>0)
 	if (menu[menuId].parentId>0)
 	{
 	{
-		ItemForeground = subItemForeground 
-		Border = subItemBorder 
-		Background = subItemBackground 
+		ItemForeground = subItemForeground
+		Border = subItemBorder
+		Background = subItemBackground
 
 
-		HoverForeground = subItemHoverForeground 
-		HoverBorder = subItemHoverBorder 
-		HoverBackground = subItemHoverBackground 
+		HoverForeground = subItemHoverForeground
+		HoverBorder = subItemHoverBorder
+		HoverBackground = subItemHoverBackground
 	}
 	}
 	else
 	else
 	{
 	{
-		ItemForeground = mainItemForeground 
-		Border = mainItemBorder 
-		Background = mainItemBackground 
+		ItemForeground = mainItemForeground
+		Border = mainItemBorder
+		Background = mainItemBackground
 
 
-		HoverForeground = mainItemHoverForeground 
-		HoverBorder = mainItemHoverBorder 
-		HoverBackground = mainItemHoverBackground 
+		HoverForeground = mainItemHoverForeground
+		HoverBorder = mainItemHoverBorder
+		HoverBackground = mainItemHoverBackground
 	}
 	}
 
 
 	if ((orientation==1)||(menu[menuId].levelId>0))
 	if ((orientation==1)||(menu[menuId].levelId>0))
 	{
 	{
 		sHTML += "<tr>"
 		sHTML += "<tr>"
-	}	
+	}
 
 
 	if (menu[menuId].description!='-')
 	if (menu[menuId].description!='-')
 	{
 	{
@@ -145,7 +145,7 @@ function displayMenuItem(menuId) {
 	if ((orientation==1)||(menu[menuId].levelId>0))
 	if ((orientation==1)||(menu[menuId].levelId>0))
 	{
 	{
 		sHTML += "</tr>"
 		sHTML += "</tr>"
-	}	
+	}
 	return sHTML
 	return sHTML
 }
 }
 
 
@@ -153,13 +153,13 @@ function clearAll(levelId, parentId) {
 
 
 	if (levelId>0)
 	if (levelId>0)
 	{
 	{
-		Border = subItemBorder 
-		Background = subItemBackground 
+		Border = subItemBorder
+		Background = subItemBackground
 	}
 	}
 	else
 	else
 	{
 	{
-		Border = mainItemBorder 
-		Background = mainItemBackground 
+		Border = mainItemBorder
+		Background = mainItemBackground
 	}
 	}
 
 
 	for (i=0;i<menuCounter;i++)
 	for (i=0;i<menuCounter;i++)
@@ -202,7 +202,7 @@ function showSubmenu(menuId,trigger) {
 
 
 function showActualSubmenu(menuId,trigger) {
 function showActualSubmenu(menuId,trigger) {
 	var nLevel = 0
 	var nLevel = 0
-	var leftpos = 0 
+	var leftpos = 0
 	var nIndex=0
 	var nIndex=0
 
 
 	if (menuId>0)
 	if (menuId>0)
@@ -212,7 +212,7 @@ function showActualSubmenu(menuId,trigger) {
 		for (var i=0;i<menuCounter;i++)
 		for (var i=0;i<menuCounter;i++)
 		{
 		{
 			if (menu[i].id==menuId)
 			if (menu[i].id==menuId)
-			{	
+			{
 				nLevel = menu[i].levelId
 				nLevel = menu[i].levelId
 				nIndex = i
 				nIndex = i
 			}
 			}
@@ -246,7 +246,7 @@ function showActualSubmenu(menuId,trigger) {
 
 
 		document.getElementById("menu_level_"+nLevel+"_content").innerHTML=sHTML
 		document.getElementById("menu_level_"+nLevel+"_content").innerHTML=sHTML
 		lw_showLayer('menu_level_'+nLevel)
 		lw_showLayer('menu_level_'+nLevel)
-	} 
+	}
 }
 }
 
 
 function hideSubmenu(levelId) {
 function hideSubmenu(levelId) {
@@ -262,16 +262,16 @@ function DrawMenu ()  {
 	{
 	{
 		lw_createLayer("menu_level_"+i,0,0,0,0,"#ffffff","#d0d0d0",100)
 		lw_createLayer("menu_level_"+i,0,0,0,0,"#ffffff","#d0d0d0",100)
 	}
 	}
-	
+
 	sHTML="<table width=100% cellpadding=2 cellspacing=0>"
 	sHTML="<table width=100% cellpadding=2 cellspacing=0>"
 	for (var i=0; i<menuCounter; i++)
 	for (var i=0; i<menuCounter; i++)
 	{
 	{
 		if (menu[i].parentId==0)
 		if (menu[i].parentId==0)
-		{		
+		{
 			sHTML += displayMenuItem (i)
 			sHTML += displayMenuItem (i)
 		}
 		}
 		else if (menu[i].parentId==-1)
 		else if (menu[i].parentId==-1)
-		{		
+		{
 			sHTML += "<tr><td valign='top'><img src='trans' height=2></td></tr><tr bgcolor='"+mainItemBackground+"'><td style='padding:5px'><b>" + menu[i].description + "</b></td></tr>"
 			sHTML += "<tr><td valign='top'><img src='trans' height=2></td></tr><tr bgcolor='"+mainItemBackground+"'><td style='padding:5px'><b>" + menu[i].description + "</b></td></tr>"
 		}
 		}
 	}
 	}
@@ -291,7 +291,7 @@ function getLevel (menuId) {
 		for (var i=0;i<menuCounter;i++)
 		for (var i=0;i<menuCounter;i++)
 		{
 		{
 			if (menu[i].id==pId)
 			if (menu[i].id==pId)
-			{	
+			{
 				pId = menu[i].parentId
 				pId = menu[i].parentId
 			}
 			}
 		}
 		}
@@ -316,10 +316,10 @@ function AddMenuItem (id, parentId, url, description, img)  {
 		menu[menuCounter-1].levelId = getLevel(parentId)
 		menu[menuCounter-1].levelId = getLevel(parentId)
 
 
 		if ( numLevel < menu[menuCounter-1].levelId)
 		if ( numLevel < menu[menuCounter-1].levelId)
-		{	
+		{
 			numLevel = menu[menuCounter-1].levelId
 			numLevel = menu[menuCounter-1].levelId
 		}
 		}
-	}	 
+	}
 	else if (parentId==0)
 	else if (parentId==0)
 	{
 	{
 		menu[menuCounter-1].levelId = 0
 		menu[menuCounter-1].levelId = 0

+ 22 - 22
resources/calendar_popcalendar.js

@@ -46,22 +46,22 @@
           {
           {
             continue;
             continue;
           }
           }
-      
+
           // Find the element's offsetTop and offsetLeft relative to the BODY tag.
           // Find the element's offsetTop and offsetLeft relative to the BODY tag.
           objLeft   = obj.offsetLeft;
           objLeft   = obj.offsetLeft;
           objTop    = obj.offsetTop;
           objTop    = obj.offsetTop;
           objParent = obj.offsetParent;
           objParent = obj.offsetParent;
-          
+
           while( objParent.tagName.toUpperCase() != "BODY" )
           while( objParent.tagName.toUpperCase() != "BODY" )
           {
           {
             objLeft  += objParent.offsetLeft;
             objLeft  += objParent.offsetLeft;
             objTop   += objParent.offsetTop;
             objTop   += objParent.offsetTop;
             objParent = objParent.offsetParent;
             objParent = objParent.offsetParent;
           }
           }
-      
+
           objHeight = obj.offsetHeight;
           objHeight = obj.offsetHeight;
           objWidth = obj.offsetWidth;
           objWidth = obj.offsetWidth;
-      
+
           if(( overDiv.offsetLeft + overDiv.offsetWidth ) <= objLeft );
           if(( overDiv.offsetLeft + overDiv.offsetWidth ) <= objLeft );
           else if(( overDiv.offsetTop + overDiv.offsetHeight ) <= objTop );
           else if(( overDiv.offsetTop + overDiv.offsetHeight ) <= objTop );
           else if( overDiv.offsetTop >= ( objTop + objHeight ));
           else if( overDiv.offsetTop >= ( objTop + objHeight ));
@@ -73,7 +73,7 @@
         }
         }
       }
       }
     }
     }
-     
+
     /*
     /*
     * unhides <select> and <applet> objects (for IE only)
     * unhides <select> and <applet> objects (for IE only)
     */
     */
@@ -84,12 +84,12 @@
         for( i = 0; i < document.all.tags( elmID ).length; i++ )
         for( i = 0; i < document.all.tags( elmID ).length; i++ )
         {
         {
           obj = document.all.tags( elmID )[i];
           obj = document.all.tags( elmID )[i];
-          
+
           if( !obj || !obj.offsetParent )
           if( !obj || !obj.offsetParent )
           {
           {
             continue;
             continue;
           }
           }
-        
+
           obj.style.visibility = "";
           obj.style.visibility = "";
         }
         }
       }
       }
@@ -126,7 +126,7 @@
             //bottom background
             //bottom background
 			document.write ("<tr bgcolor=#f0f0f0><td style='padding:5px' align=center><span id='lblToday'></span></td></tr>")
 			document.write ("<tr bgcolor=#f0f0f0><td style='padding:5px' align=center><span id='lblToday'></span></td></tr>")
 		}
 		}
-			
+
 		document.write ("</table></div><div id='selectMonth' style='z-index:+999;position:absolute;visibility:hidden;'></div><div id='selectYear' style='z-index:+999;position:absolute;visibility:hidden;'></div>");
 		document.write ("</table></div><div id='selectMonth' style='z-index:+999;position:absolute;visibility:hidden;'></div><div id='selectYear' style='z-index:+999;position:absolute;visibility:hidden;'></div>");
 	}
 	}
 
 
@@ -171,7 +171,7 @@
 			sHTML1+="<span id='spanRight' style='border-style:solid;border-width:0;border-color:#D3DCE4;cursor:pointer'	onmouseover='swapImage(\"changeRight\",\"calright.png\");window.status=\""+scrollRightMessage+"\"' onmouseout='clearInterval(intervalID1);swapImage(\"changeRight\",\"calright.png\");window.status=\"\"' onclick='incMonth()' onmousedown='clearTimeout(timeoutID1);timeoutID1=setTimeout(\"StartIncMonth()\",500)'	onmouseup='clearTimeout(timeoutID1);clearInterval(intervalID1)'>&nbsp<IMG id='changeRight' SRC='"+imgDir+"calright.png'	BORDER=0>&nbsp</span>&nbsp"
 			sHTML1+="<span id='spanRight' style='border-style:solid;border-width:0;border-color:#D3DCE4;cursor:pointer'	onmouseover='swapImage(\"changeRight\",\"calright.png\");window.status=\""+scrollRightMessage+"\"' onmouseout='clearInterval(intervalID1);swapImage(\"changeRight\",\"calright.png\");window.status=\"\"' onclick='incMonth()' onmousedown='clearTimeout(timeoutID1);timeoutID1=setTimeout(\"StartIncMonth()\",500)'	onmouseup='clearTimeout(timeoutID1);clearInterval(intervalID1)'>&nbsp<IMG id='changeRight' SRC='"+imgDir+"calright.png'	BORDER=0>&nbsp</span>&nbsp"
 			sHTML1+="<span id='spanMonth' style='border-style:solid;border-width:0;border-color:#D3DCE4;cursor:pointer'	onmouseover='swapImage(\"changeMonth\",\"caldrop.png\");window.status=\""+selectMonthMessage+"\"' onmouseout='swapImage(\"changeMonth\",\"caldrop.png\");window.status=\"\"' onclick='popUpMonth()'></span>&nbsp;"
 			sHTML1+="<span id='spanMonth' style='border-style:solid;border-width:0;border-color:#D3DCE4;cursor:pointer'	onmouseover='swapImage(\"changeMonth\",\"caldrop.png\");window.status=\""+selectMonthMessage+"\"' onmouseout='swapImage(\"changeMonth\",\"caldrop.png\");window.status=\"\"' onclick='popUpMonth()'></span>&nbsp;"
 			sHTML1+="<span id='spanYear' style='border-style:solid;border-width:0;border-color:#D3DCE4;cursor:pointer' onmouseover='swapImage(\"changeYear\",\"caldrop.png\");window.status=\""+selectYearMessage+"\"'	onmouseout='swapImage(\"changeYear\",\"caldrop.png\");window.status=\"\"'	onclick='popUpYear()'></span>&nbsp;"
 			sHTML1+="<span id='spanYear' style='border-style:solid;border-width:0;border-color:#D3DCE4;cursor:pointer' onmouseover='swapImage(\"changeYear\",\"caldrop.png\");window.status=\""+selectYearMessage+"\"'	onmouseout='swapImage(\"changeYear\",\"caldrop.png\");window.status=\"\"'	onclick='popUpYear()'></span>&nbsp;"
-			
+
 			document.getElementById("caption").innerHTML  =	sHTML1
 			document.getElementById("caption").innerHTML  =	sHTML1
 
 
 			bPageLoaded=true
 			bPageLoaded=true
@@ -272,7 +272,7 @@
 		crossMonthObj.top =	parseInt(crossobj.top) + 26
 		crossMonthObj.top =	parseInt(crossobj.top) + 26
 
 
 		hideElement( 'SELECT', document.getElementById("selectMonth") );
 		hideElement( 'SELECT', document.getElementById("selectMonth") );
-		hideElement( 'APPLET', document.getElementById("selectMonth") );			
+		hideElement( 'APPLET', document.getElementById("selectMonth") );
 	}
 	}
 
 
 	function popDownMonth()	{
 	function popDownMonth()	{
@@ -376,7 +376,7 @@
       // L = d4 / 1460
       // L = d4 / 1460
       // d1 = ((d4 - L) mod 365) + L
       // d1 = ((d4 - L) mod 365) + L
       // WeekNumber = d1 / 7 + 1
       // WeekNumber = d1 / 7 + 1
- 
+
       year = n.getFullYear();
       year = n.getFullYear();
       month = n.getMonth() + 1;
       month = n.getMonth() + 1;
       if (startAt == 0) {
       if (startAt == 0) {
@@ -385,7 +385,7 @@
       else {
       else {
          day = n.getDate();
          day = n.getDate();
       }
       }
- 
+
       a = Math.floor((14-month) / 12);
       a = Math.floor((14-month) / 12);
       y = year + 4800 - a;
       y = year + 4800 - a;
       m = month + 12 * a - 3;
       m = month + 12 * a - 3;
@@ -395,7 +395,7 @@
       L = Math.floor(d4 / 1460);
       L = Math.floor(d4 / 1460);
       d1 = ((d4 - L) % 365) + L;
       d1 = ((d4 - L) % 365) + L;
       week = Math.floor(d1/7) + 1;
       week = Math.floor(d1/7) + 1;
- 
+
       return week;
       return week;
    }
    }
 
 
@@ -419,7 +419,7 @@
 
 
 		datePointer	= 0
 		datePointer	= 0
 		dayPointer = startDate.getDay() - startAt
 		dayPointer = startDate.getDay() - startAt
-		
+
 		if (dayPointer<0)
 		if (dayPointer<0)
 		{
 		{
 			dayPointer = 6
 			dayPointer = 6
@@ -436,7 +436,7 @@
 			sHTML += "<td width='27' align='right'><B>"+ dayName[i]+"</B></td>"
 			sHTML += "<td width='27' align='right'><B>"+ dayName[i]+"</B></td>"
 		}
 		}
 		sHTML +="</tr><tr>"
 		sHTML +="</tr><tr>"
-		
+
 		if (showWeekNumber==1)
 		if (showWeekNumber==1)
 		{
 		{
 			sHTML += "<td align=right>" + WeekNbr(startDate) + "&nbsp;</td>"
 			sHTML += "<td align=right>" + WeekNbr(startDate) + "&nbsp;</td>"
@@ -446,7 +446,7 @@
 		{
 		{
 			sHTML += "<td>&nbsp;</td>"
 			sHTML += "<td>&nbsp;</td>"
 		}
 		}
-	
+
 		for	( datePointer=1; datePointer<=numDaysInMonth; datePointer++ )
 		for	( datePointer=1; datePointer<=numDaysInMonth; datePointer++ )
 		{
 		{
 			dayPointer++;
 			dayPointer++;
@@ -481,8 +481,8 @@
 			{ sHTML += "<a "+dateMessage+" title=\"" + sHint + "\" style='"+sStyle+"' href='javascript:dateSelected="+datePointer + ";closeCalendar();'>&nbsp;" + datePointer + "&nbsp;</a>" }
 			{ sHTML += "<a "+dateMessage+" title=\"" + sHint + "\" style='"+sStyle+"' href='javascript:dateSelected="+datePointer + ";closeCalendar();'>&nbsp;" + datePointer + "&nbsp;</a>" }
 
 
 			sHTML += ""
 			sHTML += ""
-			if ((dayPointer+startAt) % 7 == startAt) { 
-				sHTML += "</tr><tr>" 
+			if ((dayPointer+startAt) % 7 == startAt) {
+				sHTML += "</tr><tr>"
 				if ((showWeekNumber==1)&&(datePointer<numDaysInMonth))
 				if ((showWeekNumber==1)&&(datePointer<numDaysInMonth))
 				{
 				{
 					sHTML += "<td align=right>" + (WeekNbr(new Date(yearSelected,monthSelected,datePointer+1))) + "&nbsp;</td>"
 					sHTML += "<td align=right>" + (WeekNbr(new Date(yearSelected,monthSelected,datePointer+1))) + "&nbsp;</td>"
@@ -600,7 +600,7 @@
 				crossobj.visibility=(dom||ie)? "visible" : "show"
 				crossobj.visibility=(dom||ie)? "visible" : "show"
 
 
 				hideElement( 'SELECT', document.getElementById("calendar") );
 				hideElement( 'SELECT', document.getElementById("calendar") );
-				hideElement( 'APPLET', document.getElementById("calendar") );			
+				hideElement( 'APPLET', document.getElementById("calendar") );
 
 
 				bShow = true;
 				bShow = true;
 			}
 			}
@@ -613,13 +613,13 @@
 		}
 		}
 	}
 	}
 
 
-	document.onkeypress = function hidecal1 () { 
-		if (event.keyCode==27) 
+	document.onkeypress = function hidecal1 () {
+		if (event.keyCode==27)
 		{
 		{
 			hideCalendar()
 			hideCalendar()
 		}
 		}
 	}
 	}
-	document.onclick = function hidecal2 () { 		
+	document.onclick = function hidecal2 () {
 		if (!bShow)
 		if (!bShow)
 		{
 		{
 			hideCalendar()
 			hideCalendar()

+ 1 - 1
resources/captcha/config.php

@@ -38,7 +38,7 @@ $pathtofonts = "/captcha/fonts/"; //path from the root of the website
           <td align='right'><input type="text" name="captcha" size="15"></td>
           <td align='right'><input type="text" name="captcha" size="15"></td>
         </tr>
         </tr>
         </table>
         </table>
-        
+
     //Option2:  or add this to the html form
     //Option2:  or add this to the html form
 				<br>
 				<br>
 					<script language="JavaScript" type="text/javascript">
 					<script language="JavaScript" type="text/javascript">

+ 7 - 7
resources/email_address_validator.php

@@ -7,7 +7,7 @@
 
 
 	Released under New BSD license
 	Released under New BSD license
 	http://www.opensource.org/licenses/bsd-license.php
 	http://www.opensource.org/licenses/bsd-license.php
-	
+
 	Sample Code
 	Sample Code
 	----------------
 	----------------
 	$validator = new EmailAddressValidator;
 	$validator = new EmailAddressValidator;
@@ -25,12 +25,12 @@ class EmailAddressValidator {
 	 * @return  True if email is valid, false if not
 	 * @return  True if email is valid, false if not
 	 */
 	 */
 	public function check_email_address($strEmailAddress) {
 	public function check_email_address($strEmailAddress) {
-		
+
 		// If magic quotes is "on", email addresses with quote marks will
 		// If magic quotes is "on", email addresses with quote marks will
 		// fail validation because of added escape characters. Uncommenting
 		// fail validation because of added escape characters. Uncommenting
 		// the next three lines will allow for this issue.
 		// the next three lines will allow for this issue.
-		//if (get_magic_quotes_gpc()) { 
-		//    $strEmailAddress = stripslashes($strEmailAddress); 
+		//if (get_magic_quotes_gpc()) {
+		//    $strEmailAddress = stripslashes($strEmailAddress);
 		//}
 		//}
 
 
 		// Control characters are not allowed
 		// Control characters are not allowed
@@ -52,7 +52,7 @@ class EmailAddressValidator {
 		$arrEmailAddress[0] = substr($strEmailAddress, 0, $intAtSymbol);
 		$arrEmailAddress[0] = substr($strEmailAddress, 0, $intAtSymbol);
 		$arrEmailAddress[1] = substr($strEmailAddress, $intAtSymbol + 1);
 		$arrEmailAddress[1] = substr($strEmailAddress, $intAtSymbol + 1);
 
 
-		// Count the "@" symbols. Only one is allowed, except where 
+		// Count the "@" symbols. Only one is allowed, except where
 		// contained in quote marks in the local part. Quickest way to
 		// contained in quote marks in the local part. Quickest way to
 		// check this is to remove anything in quotes. We also remove
 		// check this is to remove anything in quotes. We also remove
 		// characters escaped with backslash, and the backslash
 		// characters escaped with backslash, and the backslash
@@ -105,7 +105,7 @@ class EmailAddressValidator {
 		$arrLocalPortion = explode('.', $strLocalPortion);
 		$arrLocalPortion = explode('.', $strLocalPortion);
 		for ($i = 0, $max = sizeof($arrLocalPortion); $i < $max; $i++) {
 		for ($i = 0, $max = sizeof($arrLocalPortion); $i < $max; $i++) {
 			 if (!preg_match('.^('
 			 if (!preg_match('.^('
-							.    '([A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]' 
+							.    '([A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]'
 							.    '[A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]{0,63})'
 							.    '[A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]{0,63})'
 							.'|'
 							.'|'
 							.    '("[^\\\"]{0,62}")'
 							.    '("[^\\\"]{0,62}")'
@@ -130,7 +130,7 @@ class EmailAddressValidator {
 		// Check if domain is IP, possibly enclosed in square brackets.
 		// Check if domain is IP, possibly enclosed in square brackets.
 		if (preg_match('/^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
 		if (preg_match('/^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
 		   .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}$/'
 		   .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}$/'
-		   ,$strDomainPortion) || 
+		   ,$strDomainPortion) ||
 			preg_match('/^\[(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
 			preg_match('/^\[(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
 		   .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}\]$/'
 		   .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}\]$/'
 		   ,$strDomainPortion)) {
 		   ,$strDomainPortion)) {

+ 1 - 1
resources/footer.php

@@ -76,7 +76,7 @@ require_once "resources/require.php";
 
 
 //prepare the template to display the output
 //prepare the template to display the output
 	$custom_head = '';
 	$custom_head = '';
-	
+
 	if (isset($_SESSION["theme"]["title"]["text"])) {
 	if (isset($_SESSION["theme"]["title"]["text"])) {
 		if (strlen($_SESSION["theme"]["title"]["text"]) > 0) {
 		if (strlen($_SESSION["theme"]["title"]["text"]) > 0) {
 			$document_title = (($document["title"] != '') ? $document["title"]." - " : null).$_SESSION["theme"]["title"]["text"];
 			$document_title = (($document["title"] != '') ? $document["title"]." - " : null).$_SESSION["theme"]["title"]["text"];

+ 53 - 53
resources/fpdi/fpdi.php

@@ -44,7 +44,7 @@ class FPDI extends FPDF_TPL
      * @var fpdi_pdf_parser[]
      * @var fpdi_pdf_parser[]
      */
      */
     public $parsers = array();
     public $parsers = array();
-    
+
     /**
     /**
      * Current parser
      * Current parser
      *
      *
@@ -65,7 +65,7 @@ class FPDI extends FPDF_TPL
      * @var array
      * @var array
      */
      */
     protected $_objStack;
     protected $_objStack;
-    
+
     /**
     /**
      * Done object stack
      * Done object stack
      *
      *
@@ -79,14 +79,14 @@ class FPDI extends FPDF_TPL
      * @var integer
      * @var integer
      */
      */
     protected $_currentObjId;
     protected $_currentObjId;
-    
+
     /**
     /**
      * Cache for imported pages/template ids
      * Cache for imported pages/template ids
      *
      *
      * @var array
      * @var array
      */
      */
     protected $_importedPages = array();
     protected $_importedPages = array();
-    
+
     /**
     /**
      * Set a source-file.
      * Set a source-file.
      *
      *
@@ -103,7 +103,7 @@ class FPDI extends FPDF_TPL
             $filename = $_filename;
             $filename = $_filename;
 
 
         $this->currentFilename = $filename;
         $this->currentFilename = $filename;
-        
+
         if (!isset($this->parsers[$filename])) {
         if (!isset($this->parsers[$filename])) {
             $this->parsers[$filename] = $this->_getPdfParser($filename);
             $this->parsers[$filename] = $this->_getPdfParser($filename);
             $this->setPdfVersion(
             $this->setPdfVersion(
@@ -112,10 +112,10 @@ class FPDI extends FPDF_TPL
         }
         }
 
 
         $this->currentParser =& $this->parsers[$filename];
         $this->currentParser =& $this->parsers[$filename];
-        
+
         return $this->parsers[$filename]->getPageCount();
         return $this->parsers[$filename]->getPageCount();
     }
     }
-    
+
     /**
     /**
      * Returns a PDF parser object
      * Returns a PDF parser object
      *
      *
@@ -127,7 +127,7 @@ class FPDI extends FPDF_TPL
         require_once('fpdi_pdf_parser.php');
         require_once('fpdi_pdf_parser.php');
     	return new fpdi_pdf_parser($filename);
     	return new fpdi_pdf_parser($filename);
     }
     }
-    
+
     /**
     /**
      * Get the current PDF version.
      * Get the current PDF version.
      *
      *
@@ -137,7 +137,7 @@ class FPDI extends FPDF_TPL
     {
     {
 		return $this->PDFVersion;
 		return $this->PDFVersion;
 	}
 	}
-    
+
     /**
     /**
      * Set the PDF version.
      * Set the PDF version.
      *
      *
@@ -147,7 +147,7 @@ class FPDI extends FPDF_TPL
     {
     {
         $this->PDFVersion = sprintf('%.1F', $version);
         $this->PDFVersion = sprintf('%.1F', $version);
     }
     }
-	
+
     /**
     /**
      * Import a page.
      * Import a page.
      *
      *
@@ -178,7 +178,7 @@ class FPDI extends FPDF_TPL
         if ($this->_inTpl) {
         if ($this->_inTpl) {
             throw new LogicException('Please import the desired pages before creating a new template.');
             throw new LogicException('Please import the desired pages before creating a new template.');
         }
         }
-        
+
         $fn = $this->currentFilename;
         $fn = $this->currentFilename;
         $boxName = '/' . ltrim($boxName, '/');
         $boxName = '/' . ltrim($boxName, '/');
 
 
@@ -187,16 +187,16 @@ class FPDI extends FPDF_TPL
         if (isset($this->_importedPages[$pageKey])) {
         if (isset($this->_importedPages[$pageKey])) {
             return $this->_importedPages[$pageKey];
             return $this->_importedPages[$pageKey];
         }
         }
-        
+
         $parser = $this->parsers[$fn];
         $parser = $this->parsers[$fn];
         $parser->setPageNo($pageNo);
         $parser->setPageNo($pageNo);
 
 
         if (!in_array($boxName, $parser->availableBoxes)) {
         if (!in_array($boxName, $parser->availableBoxes)) {
             throw new InvalidArgumentException(sprintf('Unknown box: %s', $boxName));
             throw new InvalidArgumentException(sprintf('Unknown box: %s', $boxName));
         }
         }
-            
+
         $pageBoxes = $parser->getPageBoxes($pageNo, $this->k);
         $pageBoxes = $parser->getPageBoxes($pageNo, $this->k);
-        
+
         /**
         /**
          * MediaBox
          * MediaBox
          * CropBox: Default -> MediaBox
          * CropBox: Default -> MediaBox
@@ -208,14 +208,14 @@ class FPDI extends FPDF_TPL
             $boxName = '/CropBox';
             $boxName = '/CropBox';
         if (!isset($pageBoxes[$boxName]) && $boxName == '/CropBox')
         if (!isset($pageBoxes[$boxName]) && $boxName == '/CropBox')
             $boxName = '/MediaBox';
             $boxName = '/MediaBox';
-        
+
         if (!isset($pageBoxes[$boxName]))
         if (!isset($pageBoxes[$boxName]))
             return false;
             return false;
-            
+
         $this->lastUsedPageBox = $boxName;
         $this->lastUsedPageBox = $boxName;
-        
+
         $box = $pageBoxes[$boxName];
         $box = $pageBoxes[$boxName];
-        
+
         $this->tpl++;
         $this->tpl++;
         $this->_tpls[$this->tpl] = array();
         $this->_tpls[$this->tpl] = array();
         $tpl =& $this->_tpls[$this->tpl];
         $tpl =& $this->_tpls[$this->tpl];
@@ -230,33 +230,33 @@ class FPDI extends FPDF_TPL
 
 
         // To build an array that can be used by PDF_TPL::useTemplate()
         // To build an array that can be used by PDF_TPL::useTemplate()
         $this->_tpls[$this->tpl] = array_merge($this->_tpls[$this->tpl], $box);
         $this->_tpls[$this->tpl] = array_merge($this->_tpls[$this->tpl], $box);
-        
+
         // An imported page will start at 0,0 all the time. Translation will be set in _putformxobjects()
         // An imported page will start at 0,0 all the time. Translation will be set in _putformxobjects()
         $tpl['x'] = 0;
         $tpl['x'] = 0;
         $tpl['y'] = 0;
         $tpl['y'] = 0;
-        
+
         // handle rotated pages
         // handle rotated pages
         $rotation = $parser->getPageRotation($pageNo);
         $rotation = $parser->getPageRotation($pageNo);
         $tpl['_rotationAngle'] = 0;
         $tpl['_rotationAngle'] = 0;
         if (isset($rotation[1]) && ($angle = $rotation[1] % 360) != 0) {
         if (isset($rotation[1]) && ($angle = $rotation[1] % 360) != 0) {
         	$steps = $angle / 90;
         	$steps = $angle / 90;
-                
+
             $_w = $tpl['w'];
             $_w = $tpl['w'];
             $_h = $tpl['h'];
             $_h = $tpl['h'];
             $tpl['w'] = $steps % 2 == 0 ? $_w : $_h;
             $tpl['w'] = $steps % 2 == 0 ? $_w : $_h;
             $tpl['h'] = $steps % 2 == 0 ? $_h : $_w;
             $tpl['h'] = $steps % 2 == 0 ? $_h : $_w;
-            
+
             if ($angle < 0)
             if ($angle < 0)
             	$angle += 360;
             	$angle += 360;
-            
+
         	$tpl['_rotationAngle'] = $angle * -1;
         	$tpl['_rotationAngle'] = $angle * -1;
         }
         }
-        
+
         $this->_importedPages[$pageKey] = $this->tpl;
         $this->_importedPages[$pageKey] = $this->tpl;
-        
+
         return $this->tpl;
         return $this->tpl;
     }
     }
-    
+
     /**
     /**
      * Returns the last used page boundary box.
      * Returns the last used page boundary box.
      *
      *
@@ -295,12 +295,12 @@ class FPDI extends FPDF_TPL
             $size = $this->getTemplateSize($tplIdx, $w, $h);
             $size = $this->getTemplateSize($tplIdx, $w, $h);
             $orientation = $size['w'] > $size['h'] ? 'L' : 'P';
             $orientation = $size['w'] > $size['h'] ? 'L' : 'P';
             $size = array($size['w'], $size['h']);
             $size = array($size['w'], $size['h']);
-            
+
             if (is_subclass_of($this, 'TCPDF')) {
             if (is_subclass_of($this, 'TCPDF')) {
             	$this->setPageFormat($size, $orientation);
             	$this->setPageFormat($size, $orientation);
             } else {
             } else {
             	$size = $this->_getpagesize($size);
             	$size = $this->_getpagesize($size);
-            	
+
             	if($orientation != $this->CurOrientation ||
             	if($orientation != $this->CurOrientation ||
                     $size[0] != $this->CurPageSize[0] ||
                     $size[0] != $this->CurPageSize[0] ||
                     $size[1] != $this->CurPageSize[1]
                     $size[1] != $this->CurPageSize[1]
@@ -320,16 +320,16 @@ class FPDI extends FPDF_TPL
 					$this->CurPageSize = $size;
 					$this->CurPageSize = $size;
 					$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
 					$this->PageSizes[$this->page] = array($this->wPt, $this->hPt);
 				}
 				}
-            } 
+            }
         }
         }
-        
+
         $this->_out('q 0 J 1 w 0 j 0 G 0 g'); // reset standard values
         $this->_out('q 0 J 1 w 0 j 0 G 0 g'); // reset standard values
         $size = parent::useTemplate($tplIdx, $x, $y, $w, $h);
         $size = parent::useTemplate($tplIdx, $x, $y, $w, $h);
         $this->_out('Q');
         $this->_out('Q');
-        
+
         return $size;
         return $size;
     }
     }
-    
+
     /**
     /**
      * Copy all imported objects to the resulting document.
      * Copy all imported objects to the resulting document.
      */
      */
@@ -373,33 +373,33 @@ class FPDI extends FPDF_TPL
         foreach($this->_tpls AS $tplIdx => $tpl) {
         foreach($this->_tpls AS $tplIdx => $tpl) {
             $this->_newobj();
             $this->_newobj();
     		$currentN = $this->n; // TCPDF/Protection: rem current "n"
     		$currentN = $this->n; // TCPDF/Protection: rem current "n"
-    		
+
     		$this->_tpls[$tplIdx]['n'] = $this->n;
     		$this->_tpls[$tplIdx]['n'] = $this->n;
     		$this->_out('<<' . $filter . '/Type /XObject');
     		$this->_out('<<' . $filter . '/Type /XObject');
             $this->_out('/Subtype /Form');
             $this->_out('/Subtype /Form');
             $this->_out('/FormType 1');
             $this->_out('/FormType 1');
-            
-            $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]', 
+
+            $this->_out(sprintf('/BBox [%.2F %.2F %.2F %.2F]',
                 (isset($tpl['box']['llx']) ? $tpl['box']['llx'] : $tpl['x']) * $this->k,
                 (isset($tpl['box']['llx']) ? $tpl['box']['llx'] : $tpl['x']) * $this->k,
                 (isset($tpl['box']['lly']) ? $tpl['box']['lly'] : -$tpl['y']) * $this->k,
                 (isset($tpl['box']['lly']) ? $tpl['box']['lly'] : -$tpl['y']) * $this->k,
                 (isset($tpl['box']['urx']) ? $tpl['box']['urx'] : $tpl['w'] + $tpl['x']) * $this->k,
                 (isset($tpl['box']['urx']) ? $tpl['box']['urx'] : $tpl['w'] + $tpl['x']) * $this->k,
                 (isset($tpl['box']['ury']) ? $tpl['box']['ury'] : $tpl['h'] - $tpl['y']) * $this->k
                 (isset($tpl['box']['ury']) ? $tpl['box']['ury'] : $tpl['h'] - $tpl['y']) * $this->k
             ));
             ));
-            
+
             $c = 1;
             $c = 1;
             $s = 0;
             $s = 0;
             $tx = 0;
             $tx = 0;
             $ty = 0;
             $ty = 0;
-            
+
             if (isset($tpl['box'])) {
             if (isset($tpl['box'])) {
                 $tx = -$tpl['box']['llx'];
                 $tx = -$tpl['box']['llx'];
-                $ty = -$tpl['box']['lly']; 
-                
+                $ty = -$tpl['box']['lly'];
+
                 if ($tpl['_rotationAngle'] <> 0) {
                 if ($tpl['_rotationAngle'] <> 0) {
                     $angle = $tpl['_rotationAngle'] * M_PI/180;
                     $angle = $tpl['_rotationAngle'] * M_PI/180;
                     $c = cos($angle);
                     $c = cos($angle);
                     $s = sin($angle);
                     $s = sin($angle);
-                    
+
                     switch($tpl['_rotationAngle']) {
                     switch($tpl['_rotationAngle']) {
                         case -90:
                         case -90:
                            $tx = -$tpl['box']['lly'];
                            $tx = -$tpl['box']['lly'];
@@ -419,16 +419,16 @@ class FPDI extends FPDF_TPL
                 $tx = -$tpl['x'] * 2;
                 $tx = -$tpl['x'] * 2;
                 $ty = $tpl['y'] * 2;
                 $ty = $tpl['y'] * 2;
             }
             }
-            
+
             $tx *= $this->k;
             $tx *= $this->k;
             $ty *= $this->k;
             $ty *= $this->k;
-            
+
             if ($c != 1 || $s != 0 || $tx != 0 || $ty != 0) {
             if ($c != 1 || $s != 0 || $tx != 0 || $ty != 0) {
                 $this->_out(sprintf('/Matrix [%.5F %.5F %.5F %.5F %.5F %.5F]',
                 $this->_out(sprintf('/Matrix [%.5F %.5F %.5F %.5F %.5F %.5F]',
                     $c, $s, -$s, $c, $tx, $ty
                     $c, $s, -$s, $c, $tx, $ty
                 ));
                 ));
             }
             }
-            
+
             $this->_out('/Resources ');
             $this->_out('/Resources ');
 
 
             if (isset($tpl['resources'])) {
             if (isset($tpl['resources'])) {
@@ -484,7 +484,7 @@ class FPDI extends FPDF_TPL
     		$this->_out('endobj');
     		$this->_out('endobj');
     		$this->n = $newN; // TCPDF: reset to new "n"
     		$this->n = $newN; // TCPDF: reset to new "n"
         }
         }
-        
+
         $this->_putimportedobjects();
         $this->_putimportedobjects();
     }
     }
 
 
@@ -509,7 +509,7 @@ class FPDI extends FPDF_TPL
             $this->_out($objId . ' 0 obj');
             $this->_out($objId . ' 0 obj');
             $this->_currentObjId = $objId; // for later use with encryption
             $this->_currentObjId = $objId; // for later use with encryption
         }
         }
-        
+
         return $objId;
         return $objId;
     }
     }
 
 
@@ -525,7 +525,7 @@ class FPDI extends FPDF_TPL
         if (is_subclass_of($this, 'TCPDF')) {
         if (is_subclass_of($this, 'TCPDF')) {
             parent::_prepareValue($value);
             parent::_prepareValue($value);
         }
         }
-        
+
         switch ($value[0]) {
         switch ($value[0]) {
 
 
     		case pdf_parser::TYPE_TOKEN:
     		case pdf_parser::TYPE_TOKEN:
@@ -539,7 +539,7 @@ class FPDI extends FPDF_TPL
         			$this->_straightOut($value[1] . ' ');
         			$this->_straightOut($value[1] . ' ');
     			}
     			}
     			break;
     			break;
-    			
+
     		case pdf_parser::TYPE_ARRAY:
     		case pdf_parser::TYPE_ARRAY:
 
 
     			// An array. Output the proper
     			// An array. Output the proper
@@ -600,7 +600,7 @@ class FPDI extends FPDF_TPL
     			$this->_out($value[2][1]);
     			$this->_out($value[2][1]);
     			$this->_straightOut("endstream");
     			$this->_straightOut("endstream");
     			break;
     			break;
-    			
+
             case pdf_parser::TYPE_HEX:
             case pdf_parser::TYPE_HEX:
                 $this->_straightOut('<' . $value[1] . '>');
                 $this->_straightOut('<' . $value[1] . '>');
                 break;
                 break;
@@ -608,7 +608,7 @@ class FPDI extends FPDF_TPL
             case pdf_parser::TYPE_BOOLEAN:
             case pdf_parser::TYPE_BOOLEAN:
     		    $this->_straightOut($value[1] ? 'true ' : 'false ');
     		    $this->_straightOut($value[1] ? 'true ' : 'false ');
     		    break;
     		    break;
-            
+
     		case pdf_parser::TYPE_NULL:
     		case pdf_parser::TYPE_NULL:
                 // The null object.
                 // The null object.
 
 
@@ -616,8 +616,8 @@ class FPDI extends FPDF_TPL
     			break;
     			break;
     	}
     	}
     }
     }
-    
-    
+
+
     /**
     /**
      * Modified _out() method so not each call will add a newline to the output.
      * Modified _out() method so not each call will add a newline to the output.
      */
      */
@@ -664,7 +664,7 @@ class FPDI extends FPDF_TPL
         parent::_enddoc();
         parent::_enddoc();
         $this->_closeParsers();
         $this->_closeParsers();
     }
     }
-    
+
     /**
     /**
      * Close all files opened by parsers.
      * Close all files opened by parsers.
      *
      *
@@ -679,7 +679,7 @@ class FPDI extends FPDF_TPL
 
 
         return false;
         return false;
     }
     }
-    
+
     /**
     /**
      * Removes cycled references and closes the file handles of the parser objects.
      * Removes cycled references and closes the file handles of the parser objects.
      */
      */

+ 16 - 16
resources/fpdi/fpdi_pdf_parser.php

@@ -32,35 +32,35 @@ class fpdi_pdf_parser extends pdf_parser
      * @var array
      * @var array
      */
      */
     protected $_pages;
     protected $_pages;
-    
+
     /**
     /**
      * Page count
      * Page count
      *
      *
      * @var integer
      * @var integer
      */
      */
     protected $_pageCount;
     protected $_pageCount;
-    
+
     /**
     /**
      * Current page number
      * Current page number
      *
      *
      * @var integer
      * @var integer
      */
      */
     public $pageNo;
     public $pageNo;
-    
+
     /**
     /**
      * PDF version of imported document
      * PDF version of imported document
      *
      *
      * @var string
      * @var string
      */
      */
     public $_pdfVersion;
     public $_pdfVersion;
-    
+
     /**
     /**
      * Available BoxTypes
      * Available BoxTypes
      *
      *
      * @var array
      * @var array
      */
      */
     public $availableBoxes = array('/MediaBox', '/CropBox', '/BleedBox', '/TrimBox', '/ArtBox');
     public $availableBoxes = array('/MediaBox', '/CropBox', '/BleedBox', '/TrimBox', '/ArtBox');
-        
+
     /**
     /**
      * The constructor.
      * The constructor.
      *
      *
@@ -75,11 +75,11 @@ class fpdi_pdf_parser extends pdf_parser
 
 
         // Read pages
         // Read pages
         $this->_readPages($pages, $this->_pages);
         $this->_readPages($pages, $this->_pages);
-        
+
         // count pages;
         // count pages;
         $this->_pageCount = count($this->_pages);
         $this->_pageCount = count($this->_pages);
     }
     }
-    
+
     /**
     /**
      * Get page count from source file.
      * Get page count from source file.
      *
      *
@@ -106,7 +106,7 @@ class fpdi_pdf_parser extends pdf_parser
 
 
         $this->pageNo = $pageNo;
         $this->pageNo = $pageNo;
     }
     }
-    
+
     /**
     /**
      * Get page-resources from current page
      * Get page-resources from current page
      *
      *
@@ -116,7 +116,7 @@ class fpdi_pdf_parser extends pdf_parser
     {
     {
         return $this->_getPageResources($this->_pages[$this->pageNo]);
         return $this->_getPageResources($this->_pages[$this->pageNo]);
     }
     }
-    
+
     /**
     /**
      * Get page-resources from a /Page dictionary.
      * Get page-resources from a /Page dictionary.
      *
      *
@@ -158,14 +158,14 @@ class fpdi_pdf_parser extends pdf_parser
     public function getContent()
     public function getContent()
     {
     {
         $buffer = '';
         $buffer = '';
-        
+
         if (isset($this->_pages[$this->pageNo][1][1]['/Contents'])) {
         if (isset($this->_pages[$this->pageNo][1][1]['/Contents'])) {
             $contents = $this->_getPageContent($this->_pages[$this->pageNo][1][1]['/Contents']);
             $contents = $this->_getPageContent($this->_pages[$this->pageNo][1][1]['/Contents']);
             foreach ($contents AS $tmpContent) {
             foreach ($contents AS $tmpContent) {
                 $buffer .= $this->_unFilterStream($tmpContent) . ' ';
                 $buffer .= $this->_unFilterStream($tmpContent) . ' ';
             }
             }
         }
         }
-        
+
         return $buffer;
         return $buffer;
     }
     }
 
 
@@ -178,7 +178,7 @@ class fpdi_pdf_parser extends pdf_parser
     protected function _getPageContent($contentRef)
     protected function _getPageContent($contentRef)
     {
     {
         $contents = array();
         $contents = array();
-        
+
         if ($contentRef[0] == pdf_parser::TYPE_OBJREF) {
         if ($contentRef[0] == pdf_parser::TYPE_OBJREF) {
             $content = $this->resolveObject($contentRef);
             $content = $this->resolveObject($contentRef);
             if ($content[1][0] == pdf_parser::TYPE_ARRAY) {
             if ($content[1][0] == pdf_parser::TYPE_ARRAY) {
@@ -213,12 +213,12 @@ class fpdi_pdf_parser extends pdf_parser
         if (isset($page[1][1][$boxIndex])) {
         if (isset($page[1][1][$boxIndex])) {
             $box = $page[1][1][$boxIndex];
             $box = $page[1][1][$boxIndex];
         }
         }
-        
+
         if (!is_null($box) && $box[0] == pdf_parser::TYPE_OBJREF) {
         if (!is_null($box) && $box[0] == pdf_parser::TYPE_OBJREF) {
             $tmp_box = $this->resolveObject($box);
             $tmp_box = $this->resolveObject($box);
             $box = $tmp_box[1];
             $box = $tmp_box[1];
         }
         }
-            
+
         if (!is_null($box) && $box[0] == pdf_parser::TYPE_ARRAY) {
         if (!is_null($box) && $box[0] == pdf_parser::TYPE_ARRAY) {
             $b = $box[1];
             $b = $box[1];
             return array(
             return array(
@@ -240,7 +240,7 @@ class fpdi_pdf_parser extends pdf_parser
 
 
     /**
     /**
      * Get all page boundary boxes by page number
      * Get all page boundary boxes by page number
-     * 
+     *
      * @param int $pageNo The page number
      * @param int $pageNo The page number
      * @param float $k Scale factor from user space units to points
      * @param float $k Scale factor from user space units to points
      * @return array
      * @return array
@@ -254,7 +254,7 @@ class fpdi_pdf_parser extends pdf_parser
 
 
         return $this->_getPageBoxes($this->_pages[$pageNo - 1], $k);
         return $this->_getPageBoxes($this->_pages[$pageNo - 1], $k);
     }
     }
-    
+
     /**
     /**
      * Get all boxes from /Page dictionary
      * Get all boxes from /Page dictionary
      *
      *

+ 1 - 1
resources/functions.php

@@ -657,7 +657,7 @@
 			return str_replace(array('/','\\'), '/', $path);
 			return str_replace(array('/','\\'), '/', $path);
 		}
 		}
 	}
 	}
-	
+
 	if ( !function_exists('normalize_path_to_os')) {
 	if ( !function_exists('normalize_path_to_os')) {
 		function normalize_path_to_os($path) {
 		function normalize_path_to_os($path) {
 			return str_replace(array('/','\\'), DIRECTORY_SEPARATOR, $path);
 			return str_replace(array('/','\\'), DIRECTORY_SEPARATOR, $path);

+ 1 - 1
resources/licenses.php

@@ -28,7 +28,7 @@
 	Mark J Crane <[email protected]>
 	Mark J Crane <[email protected]>
 
 
 //-----------------------------------------------------------------------------------
 //-----------------------------------------------------------------------------------
-3rd Party Licenses 
+3rd Party Licenses
 //-----------------------------------------------------------------------------------
 //-----------------------------------------------------------------------------------
 
 
 FreeSWITCH
 FreeSWITCH

+ 1 - 1
resources/pdo.php

@@ -184,7 +184,7 @@ if ($db_type == "mysql") {
 		//required for mysql_real_escape_string
 		//required for mysql_real_escape_string
 			if (function_exists(mysql_connect)) {
 			if (function_exists(mysql_connect)) {
 				$mysql_connection = @mysql_connect($db_host, $db_username, $db_password);
 				$mysql_connection = @mysql_connect($db_host, $db_username, $db_password);
-				//$mysql_connection = mysqli_connect($db_host, $db_username, $db_password,$db_name) or die("Error " . mysqli_error($link)); 
+				//$mysql_connection = mysqli_connect($db_host, $db_username, $db_password,$db_name) or die("Error " . mysqli_error($link));
 			}
 			}
 		//mysql pdo connection
 		//mysql pdo connection
 			if (strlen($db_host) == 0 && strlen($db_port) == 0) {
 			if (strlen($db_host) == 0 && strlen($db_port) == 0) {

+ 1 - 1
resources/pdo_vm.php

@@ -65,5 +65,5 @@ require "resources/require.php";
 	catch (PDOException $e) {
 	catch (PDOException $e) {
 	   echo 'Connection failed: ' . $e->getMessage();
 	   echo 'Connection failed: ' . $e->getMessage();
 	}
 	}
- 
+
  ?>
  ?>

+ 1 - 1
resources/phpmailer/LICENSE

@@ -147,7 +147,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
 you conspicuously and appropriately publish on each copy an

+ 9 - 9
resources/phpmailer/language/phpmailer.lang-nl.php

@@ -6,20 +6,20 @@
 
 
 $PHPMAILER_LANG['provide_address']      = 'Er moet tenmiste één ontvanger e-mailadres opgegeven worden.';//You must provide at least one recipient email address.
 $PHPMAILER_LANG['provide_address']      = 'Er moet tenmiste één ontvanger e-mailadres opgegeven worden.';//You must provide at least one recipient email address.
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer wordt niet ondersteund.';// mailer is not supported.
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer wordt niet ondersteund.';// mailer is not supported.
-$PHPMAILER_LANG['execute']              = 'Kon niet uitvoeren: ';//Could not execute: 
+$PHPMAILER_LANG['execute']              = 'Kon niet uitvoeren: ';//Could not execute:
 $PHPMAILER_LANG['instantiate']          = 'Kon mailfunctie niet initialiseren.';//Could not instantiate mail function.
 $PHPMAILER_LANG['instantiate']          = 'Kon mailfunctie niet initialiseren.';//Could not instantiate mail function.
 $PHPMAILER_LANG['authenticate']         = 'SMTP-fout: authenticatie mislukt.';//SMTP Error: Could not authenticate.
 $PHPMAILER_LANG['authenticate']         = 'SMTP-fout: authenticatie mislukt.';//SMTP Error: Could not authenticate.
-$PHPMAILER_LANG['from_failed']          = 'Het volgende afzendersadres is mislukt: ';//The following From address failed: 
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP-fout: de volgende ontvangers zijn mislukt: ';//SMTP Error: The following recipients failed: 
+$PHPMAILER_LANG['from_failed']          = 'Het volgende afzendersadres is mislukt: ';//The following From address failed:
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP-fout: de volgende ontvangers zijn mislukt: ';//SMTP Error: The following recipients failed:
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTP-fout: data niet geaccepteerd.';//SMTP Error: Data not accepted.
 $PHPMAILER_LANG['data_not_accepted']    = 'SMTP-fout: data niet geaccepteerd.';//SMTP Error: Data not accepted.
 $PHPMAILER_LANG['connect_host']         = 'SMTP-fout: kon niet verbinden met SMTP-host.';//SMTP Error: Could not connect to SMTP host.
 $PHPMAILER_LANG['connect_host']         = 'SMTP-fout: kon niet verbinden met SMTP-host.';//SMTP Error: Could not connect to SMTP host.
-$PHPMAILER_LANG['file_access']          = 'Kreeg geen toegang tot bestand: ';//Could not access file: 
-$PHPMAILER_LANG['file_open']            = 'Bestandsfout: kon bestand niet openen: ';//File Error: Could not open file: 
-$PHPMAILER_LANG['encoding']             = 'Onbekende codering: ';//Unknown encoding: 
-$PHPMAILER_LANG['signing']              = 'Signeerfout: ';//Signing Error: 
-$PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfout: ';//SMTP server error: 
+$PHPMAILER_LANG['file_access']          = 'Kreeg geen toegang tot bestand: ';//Could not access file:
+$PHPMAILER_LANG['file_open']            = 'Bestandsfout: kon bestand niet openen: ';//File Error: Could not open file:
+$PHPMAILER_LANG['encoding']             = 'Onbekende codering: ';//Unknown encoding:
+$PHPMAILER_LANG['signing']              = 'Signeerfout: ';//Signing Error:
+$PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfout: ';//SMTP server error:
 $PHPMAILER_LANG['empty_message']        = 'Berichttekst is leeg';//Message body empty
 $PHPMAILER_LANG['empty_message']        = 'Berichttekst is leeg';//Message body empty
 $PHPMAILER_LANG['invalid_address']      = 'Ongeldig adres';//Invalid address
 $PHPMAILER_LANG['invalid_address']      = 'Ongeldig adres';//Invalid address
-$PHPMAILER_LANG['variable_set']         = 'Kan de volgende variablen niet instellen of resetten: ';//Cannot set or reset variable: 
+$PHPMAILER_LANG['variable_set']         = 'Kan de volgende variablen niet instellen of resetten: ';//Cannot set or reset variable:
 
 
 ?>
 ?>

+ 1 - 1
resources/pop3/parse_message.php

@@ -49,7 +49,7 @@
 
 
 	$parameters=array(
 	$parameters=array(
 		'File'=>$message_file,
 		'File'=>$message_file,
-		
+
 		/* Read a message from a string instead of a file */
 		/* Read a message from a string instead of a file */
 		/* 'Data'=>'My message data string',              */
 		/* 'Data'=>'My message data string',              */
 
 

+ 6 - 6
resources/recaptchalib.php

@@ -107,7 +107,7 @@ function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
 		require_once "resources/footer.php";
 		require_once "resources/footer.php";
 		exit;
 		exit;
 	}
 	}
-	
+
 	if ($use_ssl) {
 	if ($use_ssl) {
                 $server = RECAPTCHA_API_SECURE_SERVER;
                 $server = RECAPTCHA_API_SECURE_SERVER;
         } else {
         } else {
@@ -153,7 +153,7 @@ function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $ex
 	if ($remoteip == null || $remoteip == '') {
 	if ($remoteip == null || $remoteip == '') {
 		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
 		die ("For security reasons, you must pass the remote ip to reCAPTCHA");
 	}
 	}
-	
+
         //discard spam submissions
         //discard spam submissions
         if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
         if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
                 $recaptcha_response = new ReCaptchaResponse();
                 $recaptcha_response = new ReCaptchaResponse();
@@ -208,7 +208,7 @@ function _recaptcha_aes_encrypt($val,$ky) {
 	if (! function_exists ("mcrypt_encrypt")) {
 	if (! function_exists ("mcrypt_encrypt")) {
 		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
 		die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
 	}
 	}
-	$mode=MCRYPT_MODE_CBC;   
+	$mode=MCRYPT_MODE_CBC;
 	$enc=MCRYPT_RIJNDAEL_128;
 	$enc=MCRYPT_RIJNDAEL_128;
 	$val=_recaptcha_aes_pad($val);
 	$val=_recaptcha_aes_pad($val);
 	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
 	return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
@@ -224,11 +224,11 @@ function recaptcha_mailhide_url($pubkey, $privkey, $email) {
 		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
 		die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
 		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
 		     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
 	}
 	}
-	
+
 
 
 	$ky = pack('H*', $privkey);
 	$ky = pack('H*', $privkey);
 	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
 	$cryptmail = _recaptcha_aes_encrypt ($email, $ky);
-	
+
 	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
 	return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
 }
 }
 
 
@@ -259,7 +259,7 @@ function _recaptcha_mailhide_email_parts ($email) {
 function recaptcha_mailhide_html($pubkey, $privkey, $email) {
 function recaptcha_mailhide_html($pubkey, $privkey, $email) {
 	$emailparts = _recaptcha_mailhide_email_parts ($email);
 	$emailparts = _recaptcha_mailhide_email_parts ($email);
 	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
 	$url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
-	
+
 	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
 	return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
 		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
 		"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
 
 

+ 3 - 3
resources/wysiwyg.php

@@ -169,17 +169,17 @@ tinyMCE_GZ.init({
             //error handling
             //error handling
         }
         }
     }
     }
-    
+
     function ajaxLoad(id, txt) {
     function ajaxLoad(id, txt) {
     	var inst = tinyMCE.getInstanceById(id);
     	var inst = tinyMCE.getInstanceById(id);
 
 
     	// Do you ajax call here
     	// Do you ajax call here
     	inst.setHTML(txt);
     	inst.setHTML(txt);
     }
     }
-    
+
     function ajaxSave() {
     function ajaxSave() {
     	var inst = tinyMCE.getInstanceById('content');
     	var inst = tinyMCE.getInstanceById('content');
-    
+
     	// Do you ajax call here
     	// Do you ajax call here
     	alert(inst.getHTML());
     	alert(inst.getHTML());
     }
     }