Index: trunk/admin/config/addlang.php
===================================================================
diff -u -N -r822 -r898
--- trunk/admin/config/addlang.php	(.../addlang.php)	(revision 822)
+++ trunk/admin/config/addlang.php	(.../addlang.php)	(revision 898)
@@ -1,429 +1,218 @@
 <?php
 
 ##############################################################
-
 ##In-portal													##
-
 ##############################################################
-
 ##					      In-portal							##
-
 ##					Intechnic Corporation					##
-
 ##			   All Rights Reserved, 1998-2002				##
-
 ##															##	
-
 ##	No portion of this code may be copied, reproduced or	##	
-
 ##	   otherwise redistributed without proper written		##
-
 ##	  consent of Intechnic Corporation.  Violation will		##
-
 ##	   result in revocation of the license and support		##
-
 ##	 privileges along maximum prosecution allowed by law.	##
-
 ##############################################################
 
 if(!strlen($pathtoroot))
-
 {
-
-  $path=dirname(realpath(__FILE__));
-
-  if(strlen($path))
-
-  {
-
-    /* determine the OS type for path parsing */
-
-    $pos = strpos($path,":");
-
-    if ($pos === false)
-
-    {
-
-      $gOS_TYPE="unix";
-
-      $pathchar = "/";
-
-    }
-
-    else
-
-    {
-
-      $gOS_TYPE="win";
-
-      $pathchar="\\";
-
-    }
-
-    $p = $path.$pathchar;
-
-    /*Start looking for the root flag file */
-
-    while(!strlen($pathtoroot) && strlen($p))
-
-    {
-
-      $sub = substr($p,strlen($pathchar)*-1);
-
-      if($sub==$pathchar)
-
-      {
-
-        $filename = $p."root.flg";
-
-      }
-
-      else
-
-        $filename = $p.$pathchar."root.flg";
-
-      if(file_exists($filename))
-
-      {
-
-        $pathtoroot = $p;
-
-      }
-
-      else
-
-      {
-
-        $parent = realpath($p.$pathchar."..".$pathchar);
-
-	if($parent!=$p)
-
+	$path=dirname(realpath(__FILE__));
+	if(strlen($path))
 	{
-
-	  $p = $parent;
-
+		/* determine the OS type for path parsing */
+		$pos = strpos($path,":");
+		if ($pos === false)
+		{
+			$gOS_TYPE="unix";
+			$pathchar = "/";
+		}
+		else
+		{
+			$gOS_TYPE="win";
+			$pathchar="\\";
+		}
+		$p = $path.$pathchar;
+		/*Start looking for the root flag file */
+		while(!strlen($pathtoroot) && strlen($p))
+		{
+			$sub = substr($p,strlen($pathchar)*-1);
+			if($sub==$pathchar)
+			{
+				$filename = $p."root.flg";
+			}
+			else
+			$filename = $p.$pathchar."root.flg";
+			if(file_exists($filename))
+			{
+				$pathtoroot = $p;
+			}
+			else
+			{
+				$parent = realpath($p.$pathchar."..".$pathchar);
+				if($parent!=$p)
+				{
+					$p = $parent;
+				}
+				else
+				$p = "";
+			}
+		}
+		if(!strlen($pathtoroot))
+		$pathtoroot = ".".$pathchar;
 	}
-
 	else
-
-	  $p = "";
-
-      }
-
-    }
-
-    if(!strlen($pathtoroot))
-
-      $pathtoroot = ".".$pathchar;
-
-  }
-
-  else
-
-  {
-
-    $pathtoroot = ".".$pathchar;
-
-  }
-
+	{
+		$pathtoroot = ".".$pathchar;
+	}
 }
 
-
-
 $sub = substr($pathtoroot,strlen($pathchar)*-1);
-
 if($sub!=$pathchar)
-
 {
-
-  $pathtoroot = $pathtoroot.$pathchar;
-
+	$pathtoroot = $pathtoroot.$pathchar;
 }
-
 //echo $pathtoroot;
-
 //print_r($_GET);
-
 //print_r($_POST);
-
 require_once($pathtoroot."kernel/startup.php");
-
 //admin only util
 
-
-
 /* set the destination of the image upload, relative to the root path */
-
 $DestDir = "kernel/images/";
 
-
-
 $rootURL="http://".ThisDomain().$objConfig->Get("Site_Path");
 
-
-
 $admin = $objConfig->Get("AdminDirectory");
-
 if(!strlen($admin))
-
     $admin = "admin";
 
-
-
 $localURL=$rootURL."kernel/";
-
 $adminURL = $rootURL.$admin;
-
 $imagesURL = $adminURL."/images"; 
-
 $browseURL = $adminURL."/browse";
 
-
-
 $pathtolocal = $pathtoroot."kernel/";
-
 require_once ($pathtoroot.$admin."/include/elements.php");
-
 require_once ($pathtoroot."kernel/admin/include/navmenu.php");
-
 require_once ($pathtolocal."admin/include/navmenu.php");
-
 require_once($pathtoroot.$admin."/browse/toolbar.php");
-
 require_once($pathtoroot.$admin."/listview/listview.php");
 
-
-
 $m = GetModuleArray();
-
 foreach($m as $key=>$value)
-
 {
-
-    $path = $pathtoroot. $value."admin/include/parser.php";
-
-    if(file_exists($path))
-
-    {
-
-      include_once($path);
-
-    }
-
+	$path = $pathtoroot. $value."admin/include/parser.php";
+	if(file_exists($path))
+	{
+		include_once($path);
+	}
 }
 
-
-
 $objMessages = new clsEmailMessageList();
 
-
-
 unset($objEditItems);
 
-
-
 $objEditItems = new clsLanguageList();
-
 $objEditItems->SourceTable = $objSession->GetEditTable("Language");
-
 $objEditItems->EnablePaging = FALSE;
-
 $objPhraseList = new clsPhraseList();
-
 $objPhraseList->EnablePaging = FALSE;
-
 if ($_GET["new"] == 1)
-
 {
-
 	$c = new clsLanguage(NULL);
-
 	$c->Set("DecimalPoint",".");
-
 	$c->Set("ThousandSep",",");
-
 	$c->Set("DateFormat","m-d-Y");
-
 	$c->Set("TimeFormat","g:i:s a");	
-
     $en = 0;
-
     $action = "m_lang_add";
-
     $name = prompt_language("la_Text_New");
-
     $objLanguages->CreateEmptyEditTable("LanguageId");
-
     $objPhraseList->CreateEmptyEditTable("PhraseId");
-
     $objMessages->CreateEmptyEditTable($_POST["itemlist"]);
-
 }
-
 else
-
 {   
-
     $en = (int)$_GET["en"];
 
-
-
     if (isset($_POST["itemlist"]))
-
     {         
-
         $objLanguages->CopyToEditTable("LanguageId",$_POST["itemlist"]);                
-
         $objPhraseList->CopyToEditTable("LanguageId",$_POST["itemlist"]);
-
         $objMessages->CopyToEditTable("LanguageId",$_POST["itemlist"]);
-
     }   
-
     $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable);
-
     $itemcount=$objEditItems->NumItems();
 
-
-
     $c = $objEditItems->GetItemByIndex($en);
 
-
-
     if($itemcount>1)
-
     {    
-
 	  if ($en+1 == $itemcount)
-
 		$en_next = -1;
-
 	  else
-
 		$en_next = $en+1;
-
 	
-
 	  if ($en == 0)
-
 		$en_prev = -1;
-
 	  else
-
 		$en_prev = $en-1;	
-
     }
-
     $action = "m_lang_edit";
-
     $name = $c->Get("LocalName");
-
 }
 
-
-
 $section = "in-portal:lang_general";
 
-
-
 $envar = "env=".BuildEnv();
 
-
-
 $title = $title = GetTitle("la_Text_Pack", "la_tab_General", $c->Get('LanguageId'), $c->Get('LocalName'));///prompt_language("la_Text_Configuration")." - ".$name."' ".prompt_language("la_Text_Pack")." - ".prompt_language("la_tab_General");
 
-
-
 //Display header
-
 $sec = $objSections->GetSection($section);
-
 $objListToolbar = new clsToolBar();
-
 $objListToolbar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('language','LangEditStatus','".$admin."/config/config_lang.php',1);",$imagesURL."/toolbar/tool_select.gif");
-
 $objListToolbar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('language','LangEditStatus','".$admin."/config/config_lang.php',2);",$imagesURL."/toolbar/tool_cancel.gif");
 
-
-
 if ( isset($en_prev) || isset($en_next) )
-
 {
-
   $url = $admin."/config/addlang.php"; 
-
   $objListToolbar->Add("divider");
-
   $form = "language";
-
   if($en_prev>-1)
-
   {
-
     $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');";
-
     $MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');";
-
     $onClick= $sec->Get("onclick");
-
 	$var="env=".BuildEnv()."&en=$en_prev";
-
     $link = "javascript:edit_submit('$form','$url',0,'$var');";
-
     $objListToolbar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_prev.gif");
-
   }
-
   else
-
   {
-
     $MouseOver="";
-
     $MouseOut="";
-
     $onClick="";
-
     $link="#";
-
     $objListToolbar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Category"),"#","","","","toolbar/tool_prev_f3.gif");
 
-
-
   }  
-
   if($en_next>-1)
-
   {
-
     $MouseOver="swap('moveright','toolbar/tool_next_f2.gif');";
-
     $MouseOut="swap('moveright', 'toolbar/tool_next.gif');";
-
     $onClick=$sec->Get("onclick");
-
     $var="env=".BuildEnv()."&en=$en_next";
-
     $link = "javascript:edit_submit('$form','$url',0,'$var');";    
-
     $objListToolbar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_next.gif");
-
   }
-
   else
-
   {
-
     $objListToolbar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_next_f3.gif");
-
   }
-
 }
 
-
-
   int_header($objListToolbar,NULL,$title);
-
 if ($objSession->GetVariable("HasChanges") == 1) {
 ?>
 <table width="100%" border="0" cellspacing="0" cellpadding="0" class="toolbar">
@@ -434,219 +223,117 @@
   </tr>
 </table>
 <?php } ?> 
-
 <FORM enctype="multipart/form-data" ID="language" NAME="language" method="POST" ACTION="">
-
 <TABLE cellSpacing="0" cellPadding="2" width="100%" class="tableborder">
-
 <?php int_subsection_title(prompt_language("la_tab_General")); ?>
-
 <?php $c->Data=inp_htmlize($c->Data);?>
-
 <TR <?php int_table_color(); ?> >
-
   <TD class="text"><?php echo prompt_language("la_prompt_LanguageId"); ?></TD>
-
   <TD><?php echo $c->Get("LanguageId"); ?></TD>
-
   <TD></TD>
-
 </TR>
 
-
-
 <TR <?php int_table_color(); ?> >
-
   <TD><SPAN id="prompt_packname" class="text"><?php echo prompt_language("la_prompt_PackName"); ?></SPAN></TD>
-
   <TD><input type=text ValidationType="exists" tabindex="1" NAME="packname" VALUE="<?php echo $c->Get("PackName"); ?>"></TD>
-
   <TD></TD>
-
 </TR>
 
-
-
 <TR <?php int_table_color(); ?> >
-
   <TD><SPAN id="prompt_localname"><?php echo prompt_language("la_prompt_LocalName"); ?></SPAN></TD>
-
   <TD><input type=text ValidationType="exists" tabindex="2" NAME="localname" VALUE="<?php echo $c->Get("LocalName"); ?>"></TD>
-
   <TD></TD>
-
 </TR>
-
-
-
+<!-- charset: begin -->
 <TR <?php int_table_color(); ?> >
-
+  <TD><SPAN id="prompt_theme_charset"><?php echo prompt_language("la_prompt_charset"); ?></SPAN></TD>
+  <TD><input type=text NAME="charset" tabindex="3" VALUE="<?php echo $c->Get("Charset"); ?>"></TD>
+  <TD></TD>
+</TR>
+<!-- charset: end -->
+<TR <?php int_table_color(); ?> >
   <TD><SPAN id="prompt_theme_icon"><?php echo prompt_language("la_prompt_icon_url"); ?></SPAN></TD>
-
   <TD><input type=text NAME="icon" tabindex="3" VALUE="<?php echo $c->Get("IconUrl"); ?>"></TD>
-
   <TD></TD>
-
 </TR>
 
-
-
 <TR <?php int_table_color(); ?> >
-
   <TD><SPAN id="prompt_dateformat"><?php echo prompt_language("la_prompt_lang_dateformat"); ?></SPAN></TD>
-
   <TD><input type=text NAME="date_format" tabindex="4" VALUE="<?php echo $c->Get("DateFormat"); ?>">
-
   <?php if(strlen($c->Get("DateFormat"))) echo prompt_language("la_Text_example").":".date($c->Get("DateFormat")); ?>
-
   </TD>
-
   <TD></TD>
-
 </TR>
 
-
-
 <TR <?php int_table_color(); ?> >
-
   <TD><SPAN id="prompt_timeformat"><?php echo prompt_language("la_prompt_lang_timeformat"); ?></SPAN></TD>
-
   <TD><input type=text NAME="time_format" tabindex="5" VALUE="<?php echo $c->Get("TimeFormat"); ?>">
-
   <?php if(strlen($c->Get("TimeFormat"))) echo prompt_language("la_Text_example").":".date($c->Get("TimeFormat")); ?>
-
   </TD>
-
   <TD></TD>
-
 </TR>
 
-
-
 <TR <?php int_table_color(); ?> >
-
   <TD><SPAN id="prompt_lang_decimal"><?php echo prompt_language("la_prompt_decimal"); ?></SPAN></TD>
-
   <TD><input type=text ValidationType="exists" tabindex="6" NAME="decimal" VALUE="<?php echo $c->Get("DecimalPoint"); ?>"></TD>
-
   <TD></TD>
-
 </TR>
 
-
-
 <TR <?php int_table_color(); ?> >
-
   <TD><SPAN id="prompt_lang_thousand"><?php echo prompt_language("la_prompt_thousand"); ?></SPAN></TD>
-
   <TD><input type=text NAME="thousand" tabindex="7" VALUE="<?php echo $c->Get("ThousandSep"); ?>"></TD>
-
   <TD></TD>
-
 </TR>
 
-
-
 <tr <?php int_table_color(); ?>>
-
   <td valign="top" class="text"><?php echo prompt_language("la_prompt_Enabled"); ?></td>
-
   <td>
-
     <input type="checkbox" name="enabled" tabindex="8" class="text" value="1" <?php if($c->Get("Enabled") == 1) echo "checked"; ?>>
-
   </td>
-
   <td class="text">&nbsp;</td>
-
 </tr>
 
-
-
 <tr <?php int_table_color(); ?>>
-
   <td valign="top" class="text"><?php echo prompt_language("la_prompt_Primary"); ?></td>
-
   <td>
-
     <input type="checkbox" name="primary" tabindex="9" class="text" value="1" <?php if($c->Get("PrimaryLang") == 1) echo "checked"; ?>>
-
   </td>
-
   <td class="text">&nbsp;</td>
-
 </tr>
-
 <tr <?php int_table_color(); ?>>
-
   <td valign="top" class="text"><?php echo prompt_language("la_prompt_CopyLabels"); ?></td>
-
   <td>
-
     <input type="checkbox" name="importlabels" tabindex="10" class="text" value="1">
-
     <SELECT NAME="srcpack">    
-
     <OPTION VALUE="0">--<?php echo prompt_language("la_prompt_Select_Source"); ?>
-
     <?php
-
       $ado = &GetADODBConnection();
-
       $sql = "SELECT * FROM ".GetTablePrefix()."Language";
-
       $rs = $ado->Execute($sql);
-
       while($rs && !$rs->EOF)
-
       {
-
           echo "<OPTION VALUE=\"".$rs->fields["LanguageId"]."\">".$rs->fields["PackName"]."\n";
-
           $rs->MoveNext();
-
       }
-
     ?>
-
     </SELECT>
 
-
-
   </td>
-
   <td class="text">
-
   </td>
-
       <input type=hidden NAME="Action" VALUE="<?php echo $action; ?>">
-
       <INPUT TYPE="hidden" NAME="LanguageId" VALUE="<?php echo $c->Get("LanguageId"); ?>">
-
       <input type="hidden" name="LangEditStatus" VALUE="0">
-
 </tr>
 
-
-
 </TABLE>
-
 </FORM>
-
 <!-- CODE FOR VIEW MENU -->
-
 <form method="post" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar; ?>" name="viewmenu">
-
 <input type="hidden" name="fieldname" value="">
-
 <input type="hidden" name="varvalue" value="">
-
 <input type="hidden" name="varvalue2" value="">
-
 <input type="hidden" name="Action" value="">
-
 </form>
-
 <!-- END CODE-->
-
 <?php int_footer(); ?>
\ No newline at end of file