Index: trunk/kernel/admin/include/toolbar/phrase_editor.php =================================================================== --- trunk/kernel/admin/include/toolbar/phrase_editor.php (revision 37) +++ trunk/kernel/admin/include/toolbar/phrase_editor.php (revision 38) @@ -1,96 +1,49 @@ <?php global $rootURL,$objConfig, $adminURL; $destform = $_GET["destform"]; - +if( !isset($errormsg) ) $errormsg = ''; print <<<END <script language="JavaScript1.2" src="$adminURL/include/fw_menu.js"></script> <script language="JavaScript1.2" src="$adminURL/include/checkarray.js"></script> <script language="Javascript"> <!-- var ErrorMsg = '$errormsg'; function LangSubmit() { f = document.getElementById('frmPhrase'); if(f) { if(DataIsValid(f)) { f.submit(); } else alert(ErrorMsg) } } function LangSubmitMove(url, nextId) { f = document.getElementById('frmPhrase'); if(f) { if(DataIsValid(f)) { f.action = url + '&PhraseId=' + nextId; f.submit(); } else alert(ErrorMsg) } } -/*function LangSubmitMove(status_field, targetURL, save_value,env_str) -{ - // by Alex, submits form. - - var full_env = env; - if(env_str != null) full_env += env_str; - if(full_env.substr(0,3)!="env") - full_env = 'env='+full_env; - - - f = document.getElementById('frmPhrase'); - - if(f) - { - var valid = false; - if(save_value != 2 && save_value !=-1) - { - valid = DataIsValid(f); - } - else - { - var a = f.Action; - if(a) - { - a.value=''; - } - } - if(valid || save_value==2 || save_value==-1) - { - f.action = rootURL + targetURL + '?' + full_env; - if(status_field.length>0) - { - f.elements[status_field].value = save_value; //0= stay in temp, 1=save to perm, 2 = purge no save - } - - f.submit(); - } - else - if(!valid) - alert(ErrorMsg); - - } - else - alert('Form '+formname+' was not found.'); -}*/ - - //--> </script> END; ?> Property changes on: trunk/kernel/admin/include/toolbar/phrase_editor.php ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: trunk/admin/include/elements.php =================================================================== --- trunk/admin/include/elements.php (revision 37) +++ trunk/admin/include/elements.php (revision 38) @@ -1,607 +1,607 @@ <?php ############################################################## ##In-portal :: Administration Interfaces :: Common Elements ## ############################################################## ## 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( !isset($is_install) ) $is_install = false; if(!$is_install) { if (!admin_login()) { if(!headers_sent()) { setcookie("sid"," ",time()-3600); echo "Test"; } $objSession->Logout(); header("Location: ".$adminURL."/login.php"); die(); //require_once($pathtoroot."admin/login.php"); } } global $admin,$pathtoroot, $objConfig; if(!strlen($admin)) { $admin = $objConfig->Get("AdminDirectory"); if(!strlen($admin)) { $admin = "admin"; } } require_once($pathtoroot.$admin."/include/sections.php"); $envar = "env=" . BuildEnv(); /* this function loads the javascript for each module's toolbar */ function load_module_javascript($sectionname) { global $adminURL, $pathtoroot; echo "<SCRIPT LANGUAGE=JavaScript1.2 src=\"".$adminURL."/browse/fw_menu.js\"></SCRIPT>\n"; echo "<SCRIPT LANGUAGE=JavaScript1.2 src=\"".$adminURL."/include/tabs.js\"></SCRIPT>\n"; echo "<script language=\"JavaScript1.2\" src=\"$adminURL/include/checkarray.js\"></script>\n"; global $objConfig, $ItemTabs; $m = GetModuleArray("admin"); echo "<!-- ".count($m)."-->"; foreach($m as $key=>$value) { $path = $pathtoroot. $value."admin/include/toolbar/".$sectionname.".php"; if(file_exists($path)) { echo "\n<!-- $path -->\n"; include_once($path); } else echo "\n<!-- $path not found -->\n"; } } function load_module_styles() { global $objConfig, $ItemTabs,$rootURL,$pathtoroot; $m = GetModuleArray("admin"); echo "<!-- module styles (".count($m).")-->"; foreach($m as $key=>$value) { $path = $pathtoroot.$value."admin/include/style.css"; if(file_exists($path)) { $inc = $rootURL.$value."admin/include/style.css"; print "<link rel=\"stylesheet\" type=\"text/css\" href=\"$inc\">\n"; } } } //*********************************** //Page Header function int_header($toolbar=NULL,$NavBarText=NULL,$ExtraTitle=NULL,$onLoad=NULL, $ExtraHead=NULL) { global $pathtoroot; global $pathtolocal; global $section; global $objSections; global $rootURL; global $localURL; global $adminURL; global $envar; global $admin; global $metatag; $style_sheet_global = $adminURL."/include/style.css"; $style_sheet_local = $localURL."admin/include/style.css"; $ExtraTitle = htmlentities($ExtraTitle); if (is_object($toolbar)) { if(file_exists($pathtolocal."admin/include/toolbar.php")) require_once ($pathtolocal."admin/include/toolbar.php"); //Aray of the preloaded elems //$int_toolbar_preload = array(); print "<html><head><title>In-portal</title>\n"; if(strlen($metatag)) { print $metatag."\n"; } else { print "<meta http-equiv=\"content-type\" content=\"text/html;charset=iso-8859-1\">\n"; print "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n"; } print "<link rel=\"stylesheet\" type=\"text/css\" href=\"$style_sheet_global\">\n"; load_module_styles(); require_once($pathtoroot.$admin."/include/mainscript.php"); //require_once($pathtolocal."admin/include/script.js"); print $ExtraHead; $sectionname = explode(":", $section); $sectionname = $sectionname[sizeof($sectionname)-1]; load_module_javascript($sectionname); if(is_object($toolbar)) print $toolbar->GetInitScript(); print "</head><body topmargin=\"0\" leftmargin=\"8\" marginheight=\"8\" marginwidth=\"8\" bgcolor=\"#FFFFFF\""; //*** Preload toolbar images if(strlen($onLoad)) { print $onLoad; } else print " ONLOAD=\"clear_list_checkboxes();\""; //*** Preload toolbar images if(is_object($toolbar)) { if (strlen($toolbar->Get("CheckClass"))) { print $toolbar->onLoadString().">"; } else print " >"; $menufunc = $toolbar->Get("load_menu_func"); if (strlen($menufunc)) { print "<script language=\"JavaScript1.2\">$menufunc</script>"; } } else print " >"; } else { print "<html><head><title>In-Portal </title>"; print "<meta http-equiv=\"content-type\" content=\"text/html;charset=iso-8859-1\">"; print "<meta http-equiv=\"Pragma\" content=\"no-cache\">"; print "<link rel=\"stylesheet\" type=\"text/css\" href=\"$style_sheet_global\">"; load_module_styles(); require_once ($pathtoroot.$admin."/include/mainscript.php"); //require_once ($pathtolocal."admin/include/script.js"); $sectionname = explode(":", $section); $sectionname = $sectionname[sizeof($sectionname)-1]; load_module_javascript($sectionname); print "</head><body topmargin=\"0\" leftmargin=\"8\" marginheight=\"8\" marginwidth=\"8\" bgcolor=\"#FFFFFF\">"; } if(strlen($section)>0) { $objSections->SetCurrentSection($section); $sec = $objSections->GetCurrentSection(); if ($sec->Get("notitle") != 1) print $objSections->page_title(); print $objSections->page_tabs($envar); if ($sec->Get("nonavbar") != 1) //Section Navigatior print $objSections->section_header($envar,$NavBarText,$ExtraTitle); //Toolbar if appropriate if ( isset($sections[$section]) && ($sections[$section]['toolbar']==1) || ( is_object($toolbar) ) ) print $toolbar->Build(); } }//Page Header // HELP Page Header function int_help_header() { global $pathtoroot; global $pathtolocal; global $section; global $objSections; global $rootURL; global $localURL; global $adminURL; global $envar; global $admin; global $metatag; $style_sheet_global = $adminURL."/include/style.css"; $style_sheet_local = $localURL."admin/include/style.css"; $ExtraTitle = htmlentities($ExtraTitle); // TOOLBAR: print "<html><head><title>In-Portal - Help</title>"; print "<meta http-equiv=\"content-type\" content=\"text/html;charset=iso-8859-1\">"; print "<meta http-equiv=\"Pragma\" content=\"no-cache\">"; print "<link rel=\"stylesheet\" type=\"text/css\" href=\"$style_sheet_global\">"; load_module_styles(); require_once ($pathtoroot.$admin."/include/mainscript.php"); print "</head><body topmargin=\"0\" leftmargin=\"8\" marginheight=\"8\" marginwidth=\"8\" bgcolor=\"#FFFFFF\">"; if(strlen($section)>0) { $objSections->SetCurrentSection($section); $sec = $objSections->GetCurrentSection(); if ($sec->Get("notitle") != 1) print $objSections->page_title(); if ($sec->Get("nonavbar") != 1) //Section Navigatior print $objSections->section_header($envar,$NavBarText,$ExtraTitle, true); } }// HELP Page Header function int_SectionHeader($toolbar=NULL,$onLoad=NULL,$NavBarText=NULL,$ExtraTitle=NULL) { global $pathtoroot; global $pathtolocal; global $section, $sections; global $objSections; global $rootURL; global $adminURL,$admin; global $localURL; global $envar; global $b_topmargin; if (!isset($b_topmargin)) $b_topmargin = 8; $sectionname = explode(":", $section); $sectionname = $sectionname[sizeof($sectionname)-1]; load_module_javascript($sectionname); if(is_object($toolbar)) print $toolbar->GetInitScript(); print "</head><body topmargin=\"$b_topmargin\" leftmargin=\"8\" marginheight=\"$b_topmargin\" marginwidth=\"8\" bgcolor=\"#FFFFFF\""; //*** Preload toolbar images if(strlen($onLoad)) { print $onLoad; } else print " onload=\"if (clear_checkboxes) clear_checkboxes();\""; print ">"; global $b_header_addon; if (isset($b_header_addon)) echo $b_header_addon; if(strlen($section)>0) { $objSections->SetCurrentSection($section); $sec = $objSections->GetCurrentSection(); if ($sec->Get("notitle")!=1) print $objSections->page_title(); print $objSections->page_tabs($envar); //Section Navigatior if ($sec->Get("nonavbar")!=1) { if (is_null($ExtraTitle)) $ExtraTitle = ""; print $objSections->section_header($envar,$NavBarText,$ExtraTitle); } //Toolbar if appropriate if( isset($sections[$section]) ) if($sections[$section]['toolbar'] == 1 || (is_object($toolbar)) ) print $toolbar->Build(); } }//Section Page Header //*********************************** //SubSection Title function int_subsection_title($caption) { int_table_color(1); print <<<END <!-- Subsection Title --> <tr class="subsectiontitle"> <td colspan="5">$caption</td> </tr> END; } function int_subsection_title_install($caption) { int_table_color(1); print <<<END <!-- Subsection Title --> <tr class="subsectiontitle"> <td colspan="3">$caption</td> </tr> END; } function int_subsection_title_ret($caption) { int_table_color_ret(1); $o = "<!-- Subsection Title --><tr class=\"subsectiontitle\"><td colspan=\"5\">$caption</td></tr>"; return $o; } //SubSection Title //*********************************** //Table Alternating colors function int_table_color($reset_color=0) { static $colorset; if($reset_color) { $colorset="table_color2"; return; } if ($colorset == "table_color1") $colorset = "table_color2"; else $colorset = "table_color1"; print "class=\"".$colorset."\""; }//Table Alternating colors //Table Alternating colors with return function int_table_color_ret($reset_color=0) { static $colorset; if($reset_color) { $colorset="table_color2"; return; } if ($colorset == "table_color1") $colorset = "table_color2"; else $colorset = "table_color1"; return "class=\"".$colorset."\""; }//Table Alternating colors //*********************************** //Hint function int_hint($caption) { global $imagesURL; print <<<END <table width="100%" border="0" cellspacing="0" cellpadding="2"> <tr> <td> <span class="hint"><img src="$imagesURL/smicon7.gif" width="14" height="14" align="absmiddle">$caption</span> <td> </tr> </table> END; }//Hint function int_hint_red($caption) { global $imagesURL; print <<<END <table width="100%" border="0" cellspacing="0" cellpadding="2"> <tr> <td> <span class="hint_red">$caption</span> <td> </tr> </table> END; }//Hint //*********************************** //Navigation String function int_nav($caption) { global $pathtoroot; global $imagespath; print <<<END <table width="100%" border="0" cellspacing="0" cellpadding="2" bgcolor="#f0f0f0"> <tr> <td><b class="text"><span class="navbar"><a class="navbar" href="">$caption</a></span></b></td> </tr> </table> END; }//Navigation String //*********************************** //Print Out Images function int_img($img) { global $images; global $pathtoroot; global $imagesURL; $src = $imagesURL."/".$images[$img]['file']; $alt = $images[$img]['alt']; $width = $images[$img]['width']; $height = $images[$img]['height']; $name = $img; //Set ID if needed if ($img == 'img:tool:view') $id = "ID=\"viewbutton\""; print "<img alt=\"$alt\" name=\"$name\" src=\"$src\" width=\"$width\" height=\"$height\" $id border=\"0\" align=\"absmiddle\">"; }//Print Out Images //*********************************** //Page Footer function int_footer() { global $objSession; if($objSession->HasSystemPermission("DEBUG.INFO")) { //phpinfo(); } print <<<END </body> </html> END; }//Page Footer function HomeEnv() { global $m_var_list_update; $m_var_list_update["cat"]=0; return BuildEnv(); } function UpEnv() { global $m_var_list_update,$objCatList; $current = $objCatList->CurrentCat(); $parent = $current->Get("ParentId"); $m_var_list_update["cat"]=$parent; return BuildEnv(); } function ModuleInclude($file) { global $pathtoroot; $m = GetModuleArray(); foreach($m as $key=>$value) { $path = $pathtoroot.$value.$file; if(file_exists($path)) { echo "<!-- $path -->"; @include_once($path); } } } function MultiEditButtons(&$ToolBar,$next,$prev,$Form,$StatusField, $url,$onClick, $ExtraVar="", $prev_phrase = 'Phrase Not Passed', $next_phrase = 'Phrase Not Passed') { global $adminURL; $ToolBar->Add("divider"); if($prev>-1) { $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');"; $MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');"; - $var="env=".BuildEnv()."&en=$prev&lpn=".$_REQUEST['lpn']; + $var="env=".BuildEnv()."&en=$prev&lpn=".GetVar('lpn'); if (strlen($ExtraVar)) $var.= $ExtraVar; if ($onClick != 'LangSubmitMove') { $link = "javascript:edit_submit('$Form','$StatusField','$url',0,'$var');"; } else { $link = "javascript:$onClick('$url', '$prev')"; } $ToolBar->Add("moveleft",$prev_phrase,$link,$MouseOver,$MouseOut,"","toolbar/tool_prev.gif"); } else { $MouseOver=""; $MouseOut=""; //$onClick=""; $link="#"; $ToolBar->Add("moveleft",$prev_phrase,"#","","","","toolbar/tool_prev_f3.gif"); } if($next>-1) { $MouseOver="swap('moveright','toolbar/tool_next_f2.gif');"; $MouseOut="swap('moveright', 'toolbar/tool_next.gif');"; $var="env=".BuildEnv()."&en=$next".( isset($_REQUEST['lpn']) ? '&lpn='.$_REQUEST['lpn'] : ''); if (strlen($ExtraVar)) $var.= $ExtraVar; if ($onClick != 'LangSubmitMove') { $link = "javascript:edit_submit('$Form','$StatusField','$url',0,'$var');"; } else { $link = "javascript:$onClick('$url', '$next')"; } $ToolBar->Add("moveright",$next_phrase,$link,$MouseOver,$MouseOut,"","toolbar/tool_next.gif"); } else { $ToolBar->Add("moveright",$next_phrase,"#","","","","toolbar/tool_next_f3.gif"); } } function InsertButtons(&$ToolBar, $Buttons = Array(), $params = Array() ) { foreach($Buttons as $button) switch($button) { case 'save': $ToolBar->Add( "img_save", "la_Save", "#", "swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');", "edit_submit('".$params['form']."','".$params['status_field']."','".$params['url']."',1,'&lpn=".$_REQUEST['lpn']."');","tool_select.gif"); break; case 'cancel': $ToolBar->Add( "img_cancel", "la_Cancel", "#", "swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');", "edit_submit('".$params['form']."','".$params['status_field']."','".$params['url']."',2,'&lpn=".$_REQUEST['lpn']."');","tool_cancel.gif"); break; case 'edit': break; case 'delete': break; } } function GetTitle($item_phrase, $tab_phrase, $id) { // gets correct caption for editing windows with tabs //echo "In: $item_phrase, $tab_phrase, $id"; $is_new = ($_REQUEST['new'] == 1) ? 1 : 0; $text = $is_new ? 'la_Text_Adding' : 'la_Text_Editing'; $text = admin_language($text).' '.admin_language($item_phrase); if($is_new == 0) $text .= ' #'.$id; $text .= ' - '.admin_language($tab_phrase); return $text; } function MarkFields($form_name) { // mark specified form fields as required ?> <script language="JavaScript">MarkAsRequired(document.getElementById("<?php echo $form_name; ?>"));</script> <?php } ?> Property changes on: trunk/admin/include/elements.php ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: trunk/admin/config/edit_label.php =================================================================== --- trunk/admin/config/edit_label.php (revision 37) +++ trunk/admin/config/edit_label.php (revision 38) @@ -1,328 +1,321 @@ <?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($_SERVER['SCRIPT_FILENAME'])); 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) { $p = $parent; } else $p = ""; } } if(!strlen($pathtoroot)) $pathtoroot = ".".$pathchar; } else { $pathtoroot = ".".$pathchar; } } $sub = substr($pathtoroot,strlen($pathchar)*-1); if($sub!=$pathchar) { $pathtoroot = $pathtoroot.$pathchar; } //echo $pathtoroot; require_once($pathtoroot."kernel/startup.php"); //admin only util $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"; require_once ($pathtoroot.$admin."/include/elements.php"); require_once ($pathtoroot."kernel/admin/include/navmenu.php"); require_once($pathtoroot.$admin."/toolbar.php"); require_once($pathtoroot.$admin."/listview/listview.php"); if(count($_POST)>0 && !$_GET['PhraseId'] && $add_error == '') { echo "<SCRIPT language=\"JavaScript\">\n"; echo " if(window.opener) window.opener.location=window.opener.location;\n"; echo " window.close();"; echo "</SCRIPT>"; die(); } $section = "in-portal:phrase_editor"; -$ids = $_GET["PhraseId"]; +$ids = GetVar('PhraseId'); -if(strlen($ids)) +if( strlen($ids) ) { + // useless code: begin $ids = str_replace("[","",$ids); $ids = str_replace("]","",$ids); $ids = str_replace("\"","",$ids); $ids = str_replace("\\","",$ids); + // useless code: end $PhraseIds = explode(",",$ids); } else { $LangId = $_GET["LanguageId"]; } -$EditDirect = (int)$_GET["direct"]; +$EditDirect = GetVar('direct'); if($EditDirect) { - $NewLabel = $_GET["label"]; + $NewLabel = GetVar('label'); if(!$LangId) { $LangId = $objSession->Get("Language"); } } unset($objEditItems); -if (count($PhraseIds) > 1) { +if ( isset($PhraseIds) && count($PhraseIds) > 1) { $print_list = true; } else { $ado = GetADODBConnection(); $sql = "SELECT PhraseId FROM ".$objSession->GetEditTable("Phrase"); - if ($LangId) { + if ( isset($LangId) && $LangId > 0 ) { $sql .= " WHERE LanguageId = $LangId"; } $rs = $ado->Execute($sql); - if (!$_GET['en']) { + if ( GetVar('en') === false ) { $selected_id = $PhraseIds[0]; } else { - $selected_id = $_GET['PhraseId']; + $selected_id = GetVar('PhraseId'); } $PhraseIdList = ''; while ($rs && !$rs->EOF) { $PhraseIdList .= $rs->fields['PhraseId'].","; $rs->MoveNext(); } $PhraseIdList = substr($PhraseIdList, 0, strlen($PhraseIdList)); $PhraseIdArr = explode(",", $PhraseIdList); $print_list = false; } $envar = "env=".BuildEnv(); $formaction = $_SERVER["PHP_SELF"]."?".$envar; $sec = $objSections->GetSection($section); $objListToolBar = new clsToolBar(); $objListToolBar->Set("section",$section); $objListToolBar->Set("load_menu_func",""); $objListToolBar->Set("CheckClass","ThemeChecks"); $objListToolBar->Add("select", "la_ToolTip_Select","#","swap('select','toolbar/tool_select_f2.gif');", - "swap('select', 'toolbar/tool_select.gif');", - "LangSubmit();", - "tool_select.gif"); + "swap('select', 'toolbar/tool_select.gif');", "LangSubmit();", "tool_select.gif"); $objListToolBar->Add("cancel", "la_ToolTip_Stop","#","swap('cancel','toolbar/tool_stop_f2.gif');", "swap('cancel', 'toolbar/tool_stop.gif');","window.close();","tool_stop.gif"); if (!$print_list) { $x = -1; foreach ($PhraseIdArr as $key => $value) { if ($value == $selected_id) { $x = $key; } } if ($x <= 0) { $en_next = $PhraseIdArr[$x+1]; $en_prev = false; } else if ($x >= count($PhraseIdArr) - 1) { $en_next = false; $en_prev = $PhraseIdArr[$x - 1]; } else { $en_next = $PhraseIdArr[$x+1]; $en_prev = $PhraseIdArr[$x-1]; } $url = "edit_label.php?$envar&en=0"; $form = "frmPhrase"; MultiEditButtons($objListToolBar,$en_next,$en_prev,$form,1,$url, "LangSubmitMove"); } $title = admin_language("la_Text_Editing")." ".admin_language("la_Text_Label"); int_header($objListToolBar,NULL,$title); ?> <form name="frmPhrase" ID="frmPhrase" action="<?php echo $_SERVER["PHP_SELF"]."?".$envar;?>" method=POST> <TABLE cellSpacing="0" cellPadding="2" width="100%" class="tableborder"> <?php -if(!is_object($objPhraseList)) -{ - $objPhraseList = new clsPhraseList(); -} -if(!$EditDirect) - $objPhraseList->SourceTable = $objSession->GetEditTable("Phrase"); +if( !isset($objPhraseList) ) $objPhraseList = new clsPhraseList(); + +if(!$EditDirect) $objPhraseList->SourceTable = $objSession->GetEditTable("Phrase"); $count_ids = 1; if ($print_list) { $count_ids = count($PhraseIds); + $selected_id = $PhraseIds[0]; } else { foreach($PhraseIdArr as $key => $value) { if ($value == $selected_id) { $PhraseIds[0] = $value; } } } -for($x=0;$x<$count_ids;$x++) +for($x = 0; $x < $count_ids; $x++) { $p = $objPhraseList->GetItem($PhraseIds[$x]); - //echo "<pre>"; print_r($p); echo "</pre>"; - - if(!$LangId) - $LangId = $p->Get("LanguageId"); - if(is_object($p) && $selected_id != '') + if( !isset($LangId) ) $LangId = $p->Get("LanguageId"); + if(is_object($p) && isset($selected_id) ) { echo int_subsection_title_ret(admin_language("la_tab_General").": ".GetPrimaryTranslation($p->Get("Phrase"))); - echo "<TR ".int_table_color_ret()." >\n"; - echo " <TD>".admin_language("la_prompt_PhraseId")."</TD>\n"; - echo " <TD>".$p->Get("PhraseId")."</TD>\n"; - echo " <TD></TD>\n"; - echo "</TR>\n"; - + if($p->Get('PhraseId') > 0) + { + echo "<TR ".int_table_color_ret()." >\n"; + echo " <TD>".admin_language("la_prompt_PhraseId")."</TD>\n"; + echo " <TD>".$p->Get("PhraseId")."</TD>\n"; + echo " <TD></TD>\n"; + echo "</TR>\n"; + } echo "<TR ".int_table_color_ret()." >\n"; echo " <TD>".admin_language("la_prompt_Label")."</TD>\n"; echo " <TD><input size=60 type=text tabindex=\"1\" ValidationType=\"exists\" NAME=\"name[".$p->Get("PhraseId")."]\" VALUE=\"".$p->Get("Phrase")."\"></TD>\n"; echo " <TD></TD>\n"; echo "</TR>\n"; echo "<TR ".int_table_color_ret()." >\n"; echo " <TD>".admin_language("la_prompt_Value")."</TD>\n"; echo " <TD><input size=60 type=text tabindex=\"2\" ValidationType=\"exists\" NAME=\"translation[".$p->Get("PhraseId")."]\" VALUE=\"".$p->Get("Translation")."\"></TD>\n"; echo " <TD></TD>\n"; echo "</TR>\n"; echo "<TR ".int_table_color_ret()." >\n"; echo " <TD>".admin_language("la_prompt_PhraseType")."</TD>\n"; echo " <TD COLSPAN=2>\n"; echo " <input type=radio tabindex=\"3\" NAME=\"phrasetype[".$p->Get("PhraseId")."]\" VALUE=\"0\""; if($p->Get("PhraseType")==0) echo "CHECKED"; echo ">"; echo admin_language("la_Text_Front"); echo " <input type=radio tabindex=\"3\" NAME=\"phrasetype[".$p->Get("PhraseId")."]\" VALUE=\"1\""; if($p->Get("PhraseType")==1) echo "CHECKED"; echo ">"; echo admin_language("la_Text_Admin"); echo " <input type=radio tabindex=\"3\" NAME=\"phrasetype[".$p->Get("PhraseId")."]\" VALUE=\"2\""; if($p->Get("PhraseType")==2) echo "CHECKED"; echo ">"; echo admin_language("la_Text_Both"); echo " </TD>\n"; echo "</TR>\n"; unset($p); } } +$PriTrans = isset($NewLabel) ? GetPrimaryTranslation($NewLabel) : ''; ?> -<?php - if(strlen($NewLabel)>0) - { - "::".$PriTrans = GetPrimaryTranslation($NewLabel); - } -?> -<?php if ($_GET['PhraseId'] == '') { ?> + +<?php if (GetVar('PhraseId') === false) { ?> <?php int_subsection_title(admin_language("la_tab_General").":: New Phrase ".$PriTrans); ?> <TR <?php int_table_color(); ?> > <td><?php echo admin_language("la_prompt_Label"); ?></td> <td><input type=text size=60 tabindex="4" NAME="name[0]" VALUE="<?php echo $_POST['name'][0]; ?>"></td> <td></td> </tr> <TR <?php int_table_color(); ?> > <td><?php echo admin_language("la_prompt_Value"); ?></td> <td><input type=text size=60 tabindex="5" NAME="translation[0]" VALUE="<?php echo $_POST['translation'][0]; ?>"></td> <td></td> </tr> <TR <?php int_table_color(); ?> > <TD><?php echo admin_language("la_prompt_PhraseType"); ?></TD> <TD COLSPAN=2> <input type=radio tabindex="6" NAME="phrasetype[0]" VALUE="0"> <?php echo admin_language("la_Text_Front"); ?> <input type=radio tabindex="6" NAME="phrasetype[0]" VALUE="1"> <?php echo admin_language("la_Text_Admin"); ?> <input type=radio tabindex="6" NAME="phrasetype[0]" VALUE="2"> <?php echo admin_language("la_Text_Both"); ?> </TD> </tr> <tr> - <td colspan="3" align="center"><font color="#FF0000"><?php echo $add_error; ?></font></td> + <td colspan="3" align="center"><font color="#FF0000"><?php if(isset($add_error)) echo $add_error; ?></font></td> </tr> <INPUT type=hidden name="Action1" VALUE="new"> -<?php } ?> +<?php } ?> <INPUT TYPE=HIDDEN NAME="LanguageId" VALUE="<?php echo $LangId; ?>"> <INPUT type=hidden name="Action" VALUE="m_phrase_edit"> <input type=hidden name="direct" VALUE="<?php echo $EditDirect; ?>"> </FORM> </TABLE> <?php int_footer(); ?> Property changes on: trunk/admin/config/edit_label.php ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property