diff --git a/e107_admin/admin.php b/e107_admin/admin.php index e841e236f..7dc91471c 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -191,28 +191,41 @@ function render_links($link, $title, $description, $perms, $icon = FALSE, $mode $text .= ''; } } - if ($mode == 'default') + + + switch ($mode) { - $text .= "".$icon." ".$tp->toHTML($title,FALSE,"defs, emotes_off").""; - } - elseif ($mode == 'classis') - { - $text .= "".$icon."
- ".$tp->toHTML($title,FALSE,"defs, emotes_off")."

"; - } - elseif ($mode == 'beginner') - { - $text .= "".$icon." + break; + + case 'classis': + $text .= "".$icon."
+ ".$tp->toHTML($title,FALSE,"defs, emotes_off")."

"; + break; + + case 'beginner': + $text .= "".$icon."
- ".$tp->toHTML($title,FALSE,"defs, emotes_off")."



"; - } - elseif($mode == "div") - { - $text .= "
".$icon."
+ ".$tp->toHTML($title,FALSE,"defs, emotes_off")."



"; + break; + + case 'div': + $text .= "
".$icon."
".$tp->toHTML($title,FALSE,"defs, emotes_off")." -
"; + "; + break; + + case 'div-icon-only': + $text .= "
".$icon."
"; + break; + + default: + + break; } + $td++; } } diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php index 0b6599a1f..9ebcb5234 100644 --- a/e107_admin/admin_log.php +++ b/e107_admin/admin_log.php @@ -226,7 +226,7 @@ if(($action == "confdel") || ($action == "auditdel"))
".LAN_CONFDELETE." - +
".(($action == "confdel") ? RL_LAN_047 : RL_LAN_065).$old_string." @@ -404,15 +404,15 @@ if($action == "config")
".RL_LAN_122." - +
- - + - - + - - + - - + - - + @@ -486,15 +486,15 @@ if($action == "config")
".RL_LAN_125." -
".RL_LAN_044." + ".RL_LAN_044."
".RL_LAN_123." + ".RL_LAN_123." @@ -437,8 +437,8 @@ if($action == "config")
".RL_LAN_124." + ".RL_LAN_124." ".RL_LAN_031." "; foreach($audit_checkboxes as $k => $t) @@ -458,16 +458,16 @@ if($action == "config") //==================== $text .= "
".RL_LAN_008." + ".RL_LAN_008."
".RL_LAN_009." + ".RL_LAN_009."
+
- - + @@ -504,8 +504,8 @@ if($action == "config") //==================== $text .= " - - + @@ -726,7 +726,7 @@ if(isset($page_title[$action]))
".RL_LAN_012." -
".RL_LAN_045." + ".RL_LAN_045." ".gen_log_delete('rolllog_clearadmin').RL_LAN_046."
".RL_LAN_066." + ".RL_LAN_066." ".gen_log_delete('rolllog_clearaudit').RL_LAN_046."
+
@@ -743,15 +743,15 @@ if(isset($page_title[$action])) { case 'datetimes': $text .= " - - - - "; @@ -759,10 +759,10 @@ if(isset($page_title[$action])) break; case 'datestart': $text .= " - - - - + + + - + - + @@ -804,8 +804,8 @@ if(isset($page_title[$action])) break; case 'userfilter': $text .= " - - + @@ -814,8 +814,8 @@ if(isset($page_title[$action])) break; case 'eventfilter': $text .= " - - + @@ -824,8 +824,8 @@ if(isset($page_title[$action])) break; case 'callerfilter': $text .= " - - + @@ -834,8 +834,8 @@ if(isset($page_title[$action])) break; case 'downloadidfilter': $text .= " - - + "; $filter_cols += 2; @@ -869,7 +869,7 @@ if(isset($page_title[$action]))
{$page_title[$action]} -
+ + ".time_box("starttime", $start_time, $back_day_count[$action], FALSE)." + + ".time_box("endtime", $end_time, $back_day_count[$action], TRUE)." ".RL_LAN_013."".time_box("starttime", $start_time, $back_day_count[$action], FALSE, TRUE)."".RL_LAN_092." + ".RL_LAN_013."".time_box("starttime", $start_time, $back_day_count[$action], FALSE, TRUE)."".RL_LAN_092." ".RL_LAN_058." + ".RL_LAN_058." ".RL_LAN_060." + ".RL_LAN_060."
".RL_LAN_061."
".RL_LAN_015." + ".RL_LAN_015."
".RL_LAN_016."
".RL_LAN_029." + ".RL_LAN_029."
".RL_LAN_061."
".RL_LAN_059." + ".RL_LAN_059."
".RL_LAN_061."
".RL_LAN_090." + ".RL_LAN_090."
+
"; diff --git a/e107_admin/administrator.php b/e107_admin/administrator.php index a01811b0e..51f57bc62 100644 --- a/e107_admin/administrator.php +++ b/e107_admin/administrator.php @@ -122,7 +122,7 @@ function show_admins()
".ADMSLAN_13." -
+
diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php index b7dde2a4c..d0a7d93fb 100644 --- a/e107_admin/banlist.php +++ b/e107_admin/banlist.php @@ -430,15 +430,15 @@ switch ($action)
".BANLAN_72." -
+
- - + - - + - - + - - + - - + @@ -488,15 +488,15 @@ switch ($action)
".BANLAN_74." -
".BANLAN_63." + ".BANLAN_63."
".$frm->checkbox('ban_rdns_on_access', 1, $pref['enable_rdns'] == 1)."
".BANLAN_65."
@@ -446,8 +446,8 @@ switch ($action)
".BANLAN_64." + ".BANLAN_64."
".$frm->checkbox('ban_rdns_on_ban', 1, $pref['enable_rdns_on_ban'] == 1)."
".BANLAN_66."
@@ -455,16 +455,16 @@ switch ($action)
".BANLAN_67." + ".BANLAN_67."
".drop_box('ban_access_guest', $ban_access_guest).BANLAN_70."
".drop_box('ban_access_member', $ban_access_member).BANLAN_69."
".BANLAN_68."
".BANLAN_71." + ".BANLAN_71."
".$frm->checkbox('ban_retrigger', 1, $pref['ban_retrigger'] == 1)."
".BANLAN_73."
@@ -473,8 +473,8 @@ switch ($action)
".BANLAN_91." + ".BANLAN_91." ".$frm->text('ban_date_format', varset($pref['ban_date_format'], '%H:%M %d-%m-%y'), 40)."
".BANLAN_92."
+
- - + @@ -532,7 +532,7 @@ switch ($action)
".BANLAN_77." -
".BANLAN_75." + ".BANLAN_75." ".$frm->admin_button('remove_expired_bans', BANLAN_76, 'delete')."
+
@@ -593,20 +593,20 @@ switch ($action)
".$page_title[$action]." -
+
- - - - + @@ -629,8 +629,8 @@ switch ($action) { $text .= " - - + + "; } @@ -639,16 +639,16 @@ switch ($action) { $text .= " - - + + "; } $text .= " - - + @@ -660,8 +660,8 @@ switch ($action) $text .= " - - + + "; } @@ -736,7 +736,7 @@ switch ($action)
".BANLAN_40." -
+ ".BANLAN_5.":
".BANLAN_13."
+ ".$frm->text('ban_ip', e107::getIPHandler()->ipDecode($banlist_ip), 200)." {$rdns_warn} @@ -618,8 +618,8 @@ switch ($action) { // Its a manual or unknown entry - only allow edit of reason on those $text .= "
".BANLAN_7.": + ".BANLAN_7.": ".$frm->textarea('ban_reason', $banlist_reason, 4, 50)."
".BANLAN_7.": {$banlist_reason}".BANLAN_7.": {$banlist_reason}
".BANLAN_28.": ".$ipAdministrator->getBanTypeString($banlist_bantype, FALSE)." - ".$ipAdministrator->getBanTypeString($banlist_bantype, TRUE)."".BANLAN_28.": ".$ipAdministrator->getBanTypeString($banlist_bantype, FALSE)." - ".$ipAdministrator->getBanTypeString($banlist_bantype, TRUE)."
".BANLAN_19.": + ".BANLAN_19.": ".$frm->textarea('ban_notes', $banlist_notes, 4, 50)."
".BANLAN_18.": ".ban_time_dropdown().$inhelp."".BANLAN_18.": ".ban_time_dropdown().$inhelp."
+
@@ -780,7 +780,7 @@ switch ($action)
".BANLAN_41." -
+
@@ -854,7 +854,7 @@ switch ($action) else { $text .= " -
+
"; foreach($col_widths[$action] as $fw) diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index 1103c42dc..767e86778 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -600,8 +600,8 @@ class page_admin_ui extends e_admin_ui $text .= " - - + + @@ -622,35 +622,35 @@ class page_admin_ui extends e_admin_ui - - + - - + - - + - - + - + - @@ -658,8 +658,8 @@ class page_admin_ui extends e_admin_ui /* - - + @@ -690,8 +690,8 @@ class page_admin_ui extends e_admin_ui { $text .= " - - + + "; } } @@ -793,22 +793,22 @@ class page_admin_ui extends e_admin_ui
".LAN_OPTIONS." -
".LAN_UPLOAD_IMAGES."".$tp->parseTemplate("{UPLOADFILE=".e_IMAGE."custom/}")."".LAN_UPLOAD_IMAGES."".$tp->parseTemplate("{UPLOADFILE=".e_IMAGE."custom/}")."
".CUSLAN_10." + ".CUSLAN_10." ".$frm->radio_switch('page_rating_flag', $page_rating_flag)."
".CUSLAN_13." + ".CUSLAN_13." ".$frm->radio_switch('page_comment_flag', $page_comment_flag)."
".CUSLAN_41." + ".CUSLAN_41." ".$frm->radio_switch('page_display_authordate_flag', $page_display_authordate_flag)."
".CUSLAN_14." + ".CUSLAN_14." ".$frm->text('page_password', $page_password, 50)."
".CUSLAN_15."
".CUSLAN_18."".CUSLAN_18." + ".$e_userclass->uc_dropdown('page_class', $page_class, 'public,guest,nobody,member,main,admin,classes', "tabindex='".$frm->getNext()."'")."
".CUSLAN_16." + ".CUSLAN_16." ".$frm->text('page_link', $page_link, 50)."
".CUSLAN_17."
".$hook['caption']."".$hook['text']."".$hook['caption']."".$hook['text']."
+
- - + - - + @@ -1160,7 +1160,7 @@ class page $text = "
".CUSLAN_5." -
".CUSLAN_29." + ".CUSLAN_29." ".$frm->radio_switch('listPages', $pref['listPages'])."
".CUSLAN_30." + ".CUSLAN_30." ".$frm->text('pageCookieExpire', $pref['pageCookieExpire'], 10)."
". +
". $frm->colGroup($this->fields,$this->fieldpref). $frm->thead($this->fields,$this->fieldpref). diff --git a/e107_admin/cron.php b/e107_admin/cron.php index 4e63c25c4..4891de42e 100644 --- a/e107_admin/cron.php +++ b/e107_admin/cron.php @@ -911,7 +911,7 @@ class cron $text = "
-
+
Cron Password @@ -965,7 +965,7 @@ class cron $text = "
- +
diff --git a/e107_admin/db.php b/e107_admin/db.php index 13aa5db95..dc9d71d12 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -476,7 +476,7 @@ class system_tools
".DBLAN_10." -
+
@@ -531,7 +531,7 @@ class system_tools $text = " -
+
@@ -578,7 +578,7 @@ class system_tools $text = "
Export Options -
+
@@ -614,7 +614,7 @@ class system_tools } $text .= "
- +
@@ -646,7 +646,7 @@ class system_tools
- +
@@ -753,7 +753,7 @@ class system_tools $text .= " -
+
@@ -871,7 +871,7 @@ class system_tools
".ADLAN_CL_7." -
+
@@ -1146,7 +1146,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
".DBLAN_39." -
+
@@ -1215,7 +1215,7 @@ function verify_sql_record() // deprecated by db_verify.php ( i think).
".DBLAN_40." ".$ctype." -
+
diff --git a/e107_admin/e107_update.php b/e107_admin/e107_update.php index 42f5e083d..ab737e16f 100644 --- a/e107_admin/e107_update.php +++ b/e107_admin/e107_update.php @@ -87,7 +87,7 @@ function show_updates($dbupdate, $what)
{$caption} -
+
diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php index 34c4e3eba..18228f54f 100644 --- a/e107_admin/emoticon.php +++ b/e107_admin/emoticon.php @@ -152,17 +152,17 @@ class emotec
".EMOLAN_1." -
+
- -
+ ".EMOLAN_4.": +
diff --git a/e107_admin/eurl.php b/e107_admin/eurl.php index 3a907326b..d1049cb62 100644 --- a/e107_admin/eurl.php +++ b/e107_admin/eurl.php @@ -167,7 +167,7 @@ class eurl_admin_ui extends e_admin_controller_ui
".LAN_EURL_LEGEND_ALIASES." - +
@@ -229,7 +229,7 @@ class eurl_admin_ui extends e_admin_controller_ui
".LAN_EURL_LEGEND_CONFIG." -
+
@@ -395,8 +395,8 @@ class eurl_admin_form_ui extends e_admin_form_ui $section = vartrue($admin['labels'], array()); $text .= " - - + - - - @@ -549,13 +549,13 @@ class eurl_admin_form_ui extends e_admin_form_ui $text .= " - - - diff --git a/e107_admin/filemanager.php b/e107_admin/filemanager.php index 352acd97f..41cc69c13 100644 --- a/e107_admin/filemanager.php +++ b/e107_admin/filemanager.php @@ -290,7 +290,7 @@ $text .= "
XX -
".vartrue($section['name'], eHelper::labelize($obj->module))." + ".vartrue($section['name'], eHelper::labelize($obj->module))." "; foreach ($obj->locations as $index => $location) @@ -527,13 +527,13 @@ class eurl_admin_form_ui extends e_admin_form_ui { $text .= "
+ ".LAN_EURL_CORE_INDEX." + ".LAN_EURL_CORE_INDEX_INFO." + ".LAN_EURL_FORM_HELP_EXAMPLE."
".e107::getUrl()->create('/', '', array('full' => 1))."
+ ".vartrue($section['name'], ucfirst(str_replace('_', ' ', $obj->module)))."
".LAN_EURL_FORM_HELP_ALIAS_0." {$module}
 + "; @@ -584,7 +584,7 @@ class eurl_admin_form_ui extends e_admin_form_ui $text .= " + ".implode("
", $help)."
+
diff --git a/e107_admin/fla.php b/e107_admin/fla.php index d0c743439..14a8715e7 100644 --- a/e107_admin/fla.php +++ b/e107_admin/fla.php @@ -151,7 +151,7 @@ else
".ADLAN_146." -
+
diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php index 953fa40ac..41d442f57 100644 --- a/e107_admin/frontpage.php +++ b/e107_admin/frontpage.php @@ -300,13 +300,13 @@ class frontpage
".FRTLAN_13." -
+
- - + + @@ -394,7 +394,7 @@ class frontpage
".($rule_info['order'] ? FRTLAN_46 : FRTLAN_42)."
-
+
@@ -415,7 +415,7 @@ class frontpage
- +
diff --git a/e107_admin/header.php b/e107_admin/header.php index 8fc1e9aff..9d5ce1290 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -468,6 +468,7 @@ if ($e107_popup != 1) */ function e_admin_menu($title, $active_page, $e107_vars, $tmpl = array(), $sub_link = false, $sortlist = false) { + global $E_ADMIN_MENU; if (!$tmpl) $tmpl = $E_ADMIN_MENU; @@ -509,6 +510,8 @@ if ($e107_popup != 1) unset($temp); } + + $kpost = ''; $text = ''; @@ -566,7 +569,7 @@ if ($e107_popup != 1) // echo "ap = ".$active_page; // echo " act = ".$act."

"; - if($rid == 'main') + if($rid == 'adminhome') { $temp = $tmpl['button_other'.$kpost]; } @@ -642,8 +645,8 @@ if ($e107_popup != 1) { function show_admin_menu($title, $active_page, $e107_vars, $js = FALSE, $sub_link = FALSE, $sortlist = FALSE) { - - //return e_admin_menu($title, $active_page, $e107_vars, false, false, $sortlist); + + return e_admin_menu($title, $active_page, $e107_vars, false, false, $sortlist); global $ns,$BUTTON,$BUTTON_OVER,$BUTTONS_START,$BUTTONS_END,$SUB_BUTTON,$SUB_BUTTON_OVER,$SUB_BUTTONS_START,$SUB_BUTTONS_END; diff --git a/e107_admin/image.php b/e107_admin/image.php index 1838cb5ca..493a6a983 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -673,10 +673,10 @@ class media_admin_ui extends e_admin_ui /* - - - - - - - - + - - +
+ ".IMALAN_1." +
".$frm->checkbox('image_post', 1, $pref['image_post'])."
".IMALAN_2."
@@ -684,20 +684,20 @@ class media_admin_ui extends e_admin_ui
+ ".IMALAN_10." + ".r_userclass('image_post_class',$pref['image_post_class'],"off","public,guest,nobody,member,admin,main,classes")."
".IMALAN_11."
+ ".IMALAN_12." + ".$frm->select_open('image_post_disabled_method')." ".$frm->option(IMALAN_14, '0', ($pref['image_post_disabled_method'] == "0"))." ".$frm->option(IMALAN_15, '1', ($pref['image_post_disabled_method'] == "1"))." @@ -711,15 +711,15 @@ class media_admin_ui extends e_admin_ui //TODO LANS $text .= "
Resize images during media import
Leave empty to disable
 + Resize images during media import
Leave empty to disable
 ".$frm->text('img_import_resize_w', $img_import_w,4)."px X ".$frm->text('img_import_resize_h', $img_import_h,4)."px
".IMALAN_3."
".IMALAN_54." {$gd_version}
 + ".IMALAN_3."
".IMALAN_54." {$gd_version}
 ".$frm->select_open('resize_method')." ".$frm->option('gd1', 'gd1', ($pref['resize_method'] == "gd1"))." ".$frm->option('gd2', 'gd2', ($pref['resize_method'] == "gd2"))." @@ -1151,17 +1151,17 @@ class media_admin_ui extends e_admin_ui
".IMALAN_7." - +
- - - - - - - - + - - + - - + @@ -1230,9 +1230,9 @@ class media_admin_ui extends e_admin_ui $text .= " - - - - + @@ -1518,7 +1518,7 @@ class media_admin_ui extends e_admin_ui
".DBLAN_20." -
+ ".IMALAN_1." +
".$frm->checkbox('image_post', 1, $pref['image_post'])."
".IMALAN_2."
@@ -1169,20 +1169,20 @@ class media_admin_ui extends e_admin_ui
+ ".IMALAN_10." + ".r_userclass('image_post_class',$pref['image_post_class'],"off","public,guest,nobody,member,admin,main,classes")."
".IMALAN_11."
+ ".IMALAN_12." + ".$frm->select_open('image_post_disabled_method')." ".$frm->option(IMALAN_14, '0', ($pref['image_post_disabled_method'] == "0"))." ".$frm->option(IMALAN_15, '1', ($pref['image_post_disabled_method'] == "1"))." @@ -1196,15 +1196,15 @@ class media_admin_ui extends e_admin_ui //TODO LANS $text .= "
Resize images during media import
Leave empty to disable
 + Resize images during media import
Leave empty to disable
 ".$frm->text('img_import_resize_w', $img_import_w,4)."px X ".$frm->text('img_import_resize_h', $img_import_h,4)."px
".IMALAN_3."
".IMALAN_54." {$gd_version}
 + ".IMALAN_3."
".IMALAN_54." {$gd_version}
 ".$frm->select_open('resize_method')." ".$frm->option('gd1', 'gd1', ($pref['resize_method'] == "gd1"))." ".$frm->option('gd2', 'gd2', ($pref['resize_method'] == "gd2"))." @@ -1217,8 +1217,8 @@ class media_admin_ui extends e_admin_ui $text .= " // Removed to prevent mod_security blocks, and show only when relevant (non-GD2 users)
".IMALAN_5."
{$IM_NOTE}
 + ".IMALAN_5."
{$IM_NOTE}
 ".$frm->text('im_path', $pref['im_path'])."
".IMALAN_6."
".IMALAN_34." + ".IMALAN_34." +
".$frm->checkbox('enable_png_image_fix', 1, ($pref['enable_png_image_fix']))."
".IMALAN_35."
@@ -1246,8 +1246,8 @@ class media_admin_ui extends e_admin_ui $text .= "
".IMALAN_36." + ".IMALAN_36." ".$frm->admin_button('check_avatar_sizes', ADLAN_145)."
+
@@ -2208,7 +2208,7 @@ if (isset($_POST['check_avatar_sizes']))
".CACLAN_3." -
+
@@ -2323,7 +2323,7 @@ if (isset($_POST['check_avatar_sizes'])) -
+
diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index c2b109c52..fae7031e5 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -49,7 +49,7 @@ if (isset($_POST['submit-mye107']) || varset($_POST['submit-mymenus'])) $text .= " "; - + $tp->parseTemplate("{SETSTYLE=core-infopanel}"); // Personalized Panel @@ -62,7 +62,7 @@ if (isset($_POST['submit-mye107']) || varset($_POST['submit-mymenus'])) { if (!vartrue($user_pref['core-infopanel-mye107']) || in_array($key, $user_pref['core-infopanel-mye107'])) { - $mainPanel .= render_links($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div"); + $mainPanel .= render_links($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div-icon-only"); } } @@ -71,7 +71,7 @@ if (isset($_POST['submit-mye107']) || varset($_POST['submit-mymenus'])) "; - $text .= $ns->tablerender(ucwords(USERNAME)."'s Admin Panel",$mainPanel,"core-infopanel_mye107",true); + $text .= $ns->tablerender(ucwords(USERNAME)."'s Control Panel",$mainPanel,"core-infopanel_mye107",true); // ------------------------------- e107 News -------------------------------- @@ -161,22 +161,16 @@ $panelOnline = " $text .= $ns->tablerender('Visitors Online : '.$nOnline, $panelOnline,'core-infopanel_online',true); // --------------------- User Selected Menus ------------------- + if (varset($pref['core-infopanel-menus'])) { - foreach ($pref['core-infopanel-menus'] as $val) { - $id = $frm->name2id('core-infopanel_'.$val); - $text .= " -
-
- "; - $text .= $tp->parseTemplate("{PLUGIN=$val|TRUE}"); - $text .= " -
-
- "; + $id = $frm->name2id('core-infopanel_'.$val); + $inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}"); + $text .= $inc; + // $text .= $ns->tablerender("", $inc, $id,true); } } @@ -294,6 +288,7 @@ function render_infopanel_menu_options() } global $pref; $frm = e107::getSingleton('e_form'); + $text = ""; $menu_qry = 'SELECT * FROM #menus WHERE menu_id!= 0 GROUP BY menu_name ORDER BY menu_name'; $settings = varset($pref['core-infopanel-menus'],array()); diff --git a/e107_admin/lancheck.php b/e107_admin/lancheck.php index 8f226e431..35a3cb26c 100644 --- a/e107_admin/lancheck.php +++ b/e107_admin/lancheck.php @@ -210,7 +210,7 @@ if(isset($_POST['language_sel']) && isset($_POST['language'])) $text .= "
".ADLAN_CL_7." -
+
@@ -244,7 +244,7 @@ if(isset($_POST['language_sel']) && isset($_POST['language'])) $text .= "
".LAN_CHECK_22." -
+
@@ -309,7 +309,7 @@ class lancheck $text .= "
{$legend_txt} -
+
@@ -628,7 +628,7 @@ class lancheck
".LAN_CHECK_3." ".str_replace(array(e_PLUGIN, e_LANGUAGEDIR), array(e_PLUGIN_ABS, e_LANGUAGEDIR_ABS), $dir2)."{$f2} -> {$lan} -
+
diff --git a/e107_admin/language.php b/e107_admin/language.php index 887c8a1e1..274b20889 100644 --- a/e107_admin/language.php +++ b/e107_admin/language.php @@ -243,7 +243,7 @@ if (isset($_POST['edit_existing']))
".$_POST['lang_choices']." -
+
@@ -257,8 +257,8 @@ if (isset($_POST['edit_existing'])) { $text .= " - - + - - + - - + @@ -308,6 +308,7 @@ if (isset($_POST['edit_existing']))
".ucfirst(str_replace("_", " ", $table_name))." + ".ucfirst(str_replace("_", " ", $table_name))."
"; $selected = ($sql->db_Table_exists($table_name,$_POST['lang_choices'])) ? " checked='checked'" : ""; @@ -291,15 +291,15 @@ if (isset($_POST['edit_existing'])) } $text .= "
".LANG_LAN_07." + ".LANG_LAN_07." ".$frm->checkbox('drop', 1)."
".$frm->label(LANG_LAN_08, 'drop', 1)."
".LAN_CONFDELETE." + ".LAN_CONFDELETE." ".$frm->checkbox('remove', 1)."
".$frm->label(LANG_LAN_11, 'remove', 1)."
+ ".$frm->admin_button('create_tables','no-value',$baction,$bcaption)."
@@ -322,19 +323,21 @@ require_once (e_ADMIN."footer.php"); function multilang_prefs() { global $pref,$lanlist,$emessage; + $frm = e107::getForm(); + $text = "
".LANG_LAN_13." - +
- - + - - + - - + - - @@ -396,19 +399,19 @@ function multilang_prefs() //TODO LANs and class2.php check. $text .= " - - + "; } $text .= "
".LANG_LAN_14.": + ".LANG_LAN_14.":
".LANG_LAN_12.": + ".LANG_LAN_12.":
"; $checked = ($pref['multilanguage'] == 1) ? " checked='checked'" : ""; $text .= " @@ -358,8 +361,8 @@ function multilang_prefs()
".LANG_LAN_26.": + ".LANG_LAN_26.":
\n"; $checked = ($pref['noLanguageSubs'] == 1) ? " checked='checked'" : ""; $text .= " @@ -369,11 +372,11 @@ function multilang_prefs()
+ ".LANG_LAN_18."
".LANG_LAN_19."
 +
".LANG_LAN_20."
+ Language by Domain Name
Domain determines the site's language. Enter domain without the 'www.'
".$opt."
".$opt."
-
- +
". + $frm->admin_button('submit_prefs','no-value','update',LAN_SAVE)."
\n"; @@ -457,9 +460,11 @@ function table_list() function multilang_db() { - global $pref,$tp,$frm,$emessage,$lanlist,$tabs; + global $pref, $emessage, $lanlist, $tabs; $sql = e107::getDb(); + $frm = e107::getForm(); + $tp = e107::getParser(); if (isset($pref['multilanguage']) && $pref['multilanguage']) { @@ -467,7 +472,7 @@ function multilang_db() $text = "
".LANG_LAN_16." - +
@@ -527,7 +532,8 @@ function multilang_db() } elseif ($e_language != $pref['sitelanguage']) { - $text .= ""; + // $text .= ""; + $text .= $frm->admin_button('create_edit_existing','no-value','create',LAN_CREATE); } $text .= " @@ -558,15 +564,15 @@ function show_tools()
".LAN_CHECK_1." -
+
- - + @@ -593,15 +599,15 @@ function show_tools()
".LANG_LAN_23." -
".LAN_CHECK_1." + ".LAN_CHECK_1." - + $text .= "". + $frm->admin_button('language_sel','no-value','update',LAN_CHECK_2)."
+
- - + "; @@ -626,8 +631,8 @@ function show_tools() $text .= " - - +
".LANG_LAN_23." + ".LANG_LAN_23." - - + ".$frm->admin_button('ziplang','no-value','update',LANG_LAN_24)." Check to share your language-pack with the e107 community.
Search for Deprecated Lans + Search for Deprecated Lans "; + $text .= "
"; foreach($rawData['language'] as $val) { $att = $val['@attributes']; @@ -893,7 +898,7 @@ function unused($lanfile,$script) if($lanDefines && $compare) { - $text = "
+ $text = "
"; diff --git a/e107_admin/links.php b/e107_admin/links.php index 4a7a6b8c5..fd3a6abf4 100644 --- a/e107_admin/links.php +++ b/e107_admin/links.php @@ -224,15 +224,15 @@ class links_admin_ui extends e_admin_ui
".$lanfile."
+
- - + - - + - - + - - + - - + - - + - - + - - + - - + + "; } @@ -2368,7 +2368,7 @@ class admin_newspost
".LINKLAN_6." + ".LINKLAN_6." "; foreach($sublinks as $key => $type) @@ -249,8 +249,8 @@ class links_admin_ui extends e_admin_ui
".LINKLAN_7." + ".LINKLAN_7." "; $text .= $ui->link_parent($this->getPosted('link_parent'), 'write'); $text .= " diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index 29d648778..3e38ac672 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -797,7 +797,7 @@ function show_prefs($mailAdmin) $smtp_opts = explode(',',varset($pref['smtp_options'],'')); $smtpdisp = ($pref['mailer'] != 'smtp') ? "style='display:none;'" : ''; $text .= "
- +
@@ -1030,7 +1030,7 @@ function show_maint($debug = FALSE) $text .= "
-
+
diff --git a/e107_admin/meta.php b/e107_admin/meta.php index d6bb08fbc..bef44a889 100644 --- a/e107_admin/meta.php +++ b/e107_admin/meta.php @@ -26,6 +26,7 @@ $e_sub_cat = 'meta'; require_once("auth.php"); require_once(e_HANDLER."message_handler.php"); $emessage = &eMessage::getInstance(); +$frm = e107::getForm(); if (isset($_POST['metasubmit'])) { @@ -73,42 +74,42 @@ $text = "
".METLAN_8." (".e_LANGUAGE.")"." -
+
- - + - - + - - + - - + - - + - - +
".METLAN_9." + ".METLAN_9."
".METLAN_10." + ".METLAN_10."
".METLAN_11." + ".METLAN_11."
".METLAN_13." + ".METLAN_13."
".METLAN_2." + ".METLAN_2."
eg. <meta name='author' content='your name' />
@@ -116,8 +117,8 @@ $text = "
".METLAN_12." + ".METLAN_12."
@@ -125,8 +126,8 @@ $text = "
-
- +
". + $frm->admin_button('metasubmit','no-value','create',METLAN_3)."
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 47a18935e..9395e4284 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -1595,7 +1595,7 @@ class admin_newspost
".NWSLAN_4." - +
".$frm->colGroup($this->fields, $this->fieldpref)." ".$frm->thead($this->fields, $this->fieldpref, 'action=main&sub=[FIELD]&id=[ASC]&filter='.intval($_GET['filter']).'&srch='.$_GET['srch'].'&frm=[FROM]')." "; @@ -1950,8 +1950,8 @@ class admin_newspost - - + - - + - - + @@ -2139,8 +2139,8 @@ class admin_newspost - - + +
".LAN_TEMPLATE.": + ".LAN_TEMPLATE.": "; //XXX multiple-selections at once. (comma separated) - working @@ -2122,16 +2122,16 @@ class admin_newspost
Friendly URL string: + Friendly URL string: ".$frm->text('news_sef', $tp->post_toForm($_POST['news_sef']), 255)."
If left empty will be automatically created from current News Title based on your current URL settings
".LAN_KEYWORDS.": ".$frm->tags('news_meta_keywords', $tp->post_toForm($_POST['news_meta_keywords']), 255)." + ".LAN_KEYWORDS.": ".$frm->tags('news_meta_keywords', $tp->post_toForm($_POST['news_meta_keywords']), 255)."
Keywords/tags associated to associate with this news item
Meta description: ".$frm->textarea('news_meta_description', $tp->post_toForm($_POST['news_meta_description']), 7)."Meta description: ".$frm->textarea('news_meta_description', $tp->post_toForm($_POST['news_meta_description']), 7)."
@@ -2158,8 +2158,8 @@ class admin_newspost
".NWSLAN_15.": + ".NWSLAN_15.": ".$frm->radio('news_allow_comments', 0, !$_POST['news_allow_comments'])."".$frm->label(LAN_ENABLED, 'news_allow_comments', 0)."   ".$frm->radio('news_allow_comments', 1, $_POST['news_allow_comments'])."".$frm->label(LAN_DISABLED, 'news_allow_comments', 1)."
@@ -2169,8 +2169,8 @@ class admin_newspost
".NWSLAN_19.": + ".NWSLAN_19.":
".NWSLAN_21.":
"; @@ -2187,8 +2187,8 @@ class admin_newspost
".LAN_NEWS_32.": + ".LAN_NEWS_32.":
"; @@ -2217,8 +2217,8 @@ class admin_newspost $text .= "
".NWSLAN_22.": + ".NWSLAN_22.": ".$frm->uc_select('news_userclass[]', vartrue($_POST['news_class'],0), 'nobody,public,guest,member,admin,classes,language', 'description=1&multiple=1')."
".NWSLAN_84." @@ -2226,8 +2226,8 @@ class admin_newspost
".LAN_NEWS_28.": + ".LAN_NEWS_28.": ".$frm->checkbox('news_sticky', '1', $_POST['news_sticky']).$frm->label(LAN_NEWS_29, 'news_sticky', '1')."
".LAN_NEWS_30." @@ -2239,8 +2239,8 @@ class admin_newspost if($pref['trackbackEnabled']){ $text .= "
".LAN_NEWS_34.": + ".LAN_NEWS_34.": ".LAN_NEWS_35."
@@ -2270,8 +2270,8 @@ class admin_newspost { $text .= "
".$hook['caption']."".$hook['text']."".$hook['caption']."".$hook['text']."
- @@ -2501,50 +2501,50 @@ class admin_newspost
".NWSLAN_56." -
+ ".$e107->tp->parseTemplate('{NEWSINFO}').$ix->render_newsitem($_PR, 'return')."
+
- - + - - + - - + - - + - - + - - +
".NWSLAN_52." + ".NWSLAN_52." ".$frm->text('category_name', $category['category_name'], 200)."
Required field
Category friendly URL string + Category friendly URL string ".$frm->text('category_sef', $category['category_sef'], 200)."
If left empty will be automatically created from current Category Title based on your current URL settings
Category meta keywords + Category meta keywords ".$frm->text('category_meta_keywords', $category['category_meta_keywords'], 255)."
Used on news categoty list page
Category meta description + Category meta description ".$frm->textarea('category_meta_description', $category['category_meta_description'], 5)."
Used on news categoty list page
Category management permissions + Category management permissions ".$frm->uc_select('category_manager', vartrue($category['category_manager'], e_UC_ADMIN), 'main,admin,classes')."
Which group of site administrators are able to manage this category related news
".NWSLAN_53." + ".NWSLAN_53." ".$frm->iconpicker('category_icon', $category['category_icon'], NWSLAN_54)." ".$frm->hidden('category_order', $category['category_order'])." @@ -2598,7 +2598,7 @@ class admin_newspost
".NWSLAN_51." - +
@@ -2708,34 +2708,34 @@ class admin_newspost
".NWSLAN_90." -
+
- - + - - + - - + - - + @@ -2748,15 +2748,15 @@ class admin_newspost //SecretR - Done $text .= " - - + - - + @@ -2765,39 +2765,39 @@ class admin_newspost $text .= " - - + - - + - - + - - + - - + - - + - - + - - + @@ -2856,7 +2856,7 @@ class admin_newspost
".NWSLAN_47." - +
@@ -2960,7 +2960,7 @@ class admin_newspost
".LAN_NEWS_59." -
".NWSLAN_127." + ".NWSLAN_127." ".$frm->text('news_sefbase', $pref['news_sefbase'])."
".sprintf(NWSLAN_128, e_ADMIN_ABS.'eurl.php').''.SITEURL.($pref['news_sefbase'] ? $pref['news_sefbase'].'/' : '')."
".NWSLAN_86." + ".NWSLAN_86." ".$frm->checkbox_switch('news_cats', 1, $pref['news_cats'])."
".NWSLAN_87." + ".NWSLAN_87." ".$frm->selectbox('nbr_cols', $this->_optrange(6, false), $pref['nbr_cols'], 'class=tbox')."
".NWSLAN_88." + ".NWSLAN_88." ".$frm->selectbox('newsposts', $this->_optrange(50, false), $pref['newsposts'], 'class=tbox')."
".NWSLAN_115." + ".NWSLAN_115."
".$frm->selectbox('newsposts_archive', $this->_optrange(intval($pref['newsposts']) - 1), intval($pref['newsposts_archive']), 'class=tbox')."
".NWSLAN_116."
".NWSLAN_117." + ".NWSLAN_117." ".$frm->text('newsposts_archive_title', $pref['newsposts_archive_title'])."
".LAN_NEWS_51." + ".LAN_NEWS_51." ".$frm->uc_select('news_editauthor', $pref['news_editauthor'], 'nobody,main,admin,classes')."
".NWSLAN_106." + ".NWSLAN_106." ".$frm->uc_select('subnews_class', $pref['subnews_class'], 'nobody,public,guest,member,admin,classes')."
".NWSLAN_107." + ".NWSLAN_107." ".$frm->checkbox_switch('subnews_htmlarea', '1', $pref['subnews_htmlarea'])."
".NWSLAN_100." + ".NWSLAN_100." ".$frm->checkbox_switch('subnews_attach', '1', $pref['subnews_attach'])."
".NWSLAN_101." + ".NWSLAN_101." ".$frm->number('subnews_resize', $pref['subnews_resize'], 5, 'size=6&class=tbox')."
".NWSLAN_102."
".NWSLAN_111." + ".NWSLAN_111."
".$frm->checkbox_switch('news_newdateheader', '1', $pref['news_newdateheader'])."
".NWSLAN_112."
@@ -2805,8 +2805,8 @@ class admin_newspost
".NWSLAN_113." + ".NWSLAN_113."
".$frm->checkbox_switch('news_unstemplate', '1', $pref['news_unstemplate'])."
".NWSLAN_114."
@@ -2814,8 +2814,8 @@ class admin_newspost
".NWSLAN_120." + ".NWSLAN_120." ".$frm->bbarea('news_subheader', stripcslashes($pref['news_subheader']), 2, 'helpb')."
+
@@ -2968,11 +2968,11 @@ class admin_newspost - - + - diff --git a/e107_admin/notify.php b/e107_admin/notify.php index 68d5307aa..16303d674 100644 --- a/e107_admin/notify.php +++ b/e107_admin/notify.php @@ -118,7 +118,7 @@ class notify_config
".NU_LAN_1." -
".LAN_NEWS_56." + ".LAN_NEWS_56." ".$frm->checkbox('newsdeletecomments', '1', '0').LAN_NEWS_61." + ".$frm->admin_button('news_comments_recalc', LAN_NEWS_57, 'update')."
+
@@ -133,7 +133,7 @@ class notify_config $text .= "
".NS_LAN_1." - +
@@ -145,7 +145,7 @@ class notify_config $text .= "
".NN_LAN_1." - +
@@ -159,7 +159,7 @@ class notify_config $text .= "
".NM_LAN_1." - +
@@ -171,7 +171,7 @@ class notify_config $text .= "
".NF_LAN_1." - +
@@ -189,7 +189,7 @@ class notify_config $text .= "
".$config_category." -
+
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index f40edf83a..0bd8772c0 100644 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -339,7 +339,7 @@ class pluginManager{
".$caption." -
+
".$frm->colGroup($fieldList,$this->fieldpref). $frm->thead($fieldList,$this->fieldpref)." @@ -396,7 +396,7 @@ class pluginManager{ $url = e_SELF."?src=".base64_encode($d); $id = 'plug_'.$data['plugin_folder']; return "
- +
"; } @@ -800,7 +800,7 @@ class pluginManager{ $text = " -
+
@@ -859,7 +859,7 @@ class pluginManager{
".$caption." -
+
".$frm->colGroup($this->fields,$this->fieldpref). $frm->thead($this->fields,$this->fieldpref)." @@ -1122,7 +1122,7 @@ class pluginManager{
".EPL_ADLAN_54." ".$tp->toHtml($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable")." -
+
diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index 877f0a23d..a18655ff5 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -229,36 +229,36 @@ $text = "
".PRFLAN_1." -
+
- - + - - + - - + - - + - - + + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + @@ -370,27 +370,27 @@ $text .= " $text .= "
".PRFLAN_13." -
".PRFLAN_2." + ".PRFLAN_2." ".$frm->text('sitename', $pref['sitename'], 100)."
".PRFLAN_3." + ".PRFLAN_3." ".$frm->text('siteurl', $pref['siteurl'], 150)." ".($pref['siteurl'] == SITEURL ? "" : "
( ".PRFLAN_159.": ".SITEURL." )
")."
".PRFLAN_134." + ".PRFLAN_134." ".$frm->radio('redirectsiteurl', 1, $pref['redirectsiteurl']).$frm->label(LAN_ENABLED, 'redirectsiteurl', 1)."   ".$frm->radio('redirectsiteurl', 0, !$pref['redirectsiteurl']).$frm->label(LAN_DISABLED, 'redirectsiteurl', 0)."
".PRFLAN_135."
".PRFLAN_4." + ".PRFLAN_4." "; $parms = "name=sitebutton"; @@ -290,64 +290,64 @@ $text .= "
".PRFLAN_214."".$frm->imagepicker('sitelogo',$pref['sitelogo'],'_common')."".PRFLAN_214."".$frm->imagepicker('sitelogo',$pref['sitelogo'],'_common')."
".PRFLAN_5." + ".PRFLAN_5." ".$frm->textarea('sitetag', $pref['sitetag'], 3, 59)."
".PRFLAN_6." + ".PRFLAN_6." ".$frm->textarea('sitedescription', $pref['sitedescription'], 6, 59)."
".PRFLAN_7." + ".PRFLAN_7." ".$frm->text('siteadmin', SITEADMIN, 100)."
".PRFLAN_8." + ".PRFLAN_8." ".$frm->text('siteadminemail', SITEADMINEMAIL, 100)."
".PRFLAN_174." + ".PRFLAN_174." ".$frm->text('replyto_name', $pref['replyto_name'], 100)."
".PRFLAN_175."
".PRFLAN_176." + ".PRFLAN_176." ".$frm->text('replyto_email', $pref['replyto_email'], 100)."
".PRFLAN_177."
".PRFLAN_162." + ".PRFLAN_162." ".$frm->textarea('sitecontactinfo', $pref['sitecontactinfo'], 6, 59)."
".PRFLAN_163."
".PRFLAN_168." + ".PRFLAN_168." ".$e_userclass->uc_dropdown('sitecontacts', $pref['sitecontacts'], 'nobody,main,admin,classes', "tabindex='".$frm->getNext()."'")."
".PRFLAN_169."
".PRFLAN_164." + ".PRFLAN_164." ".$frm->radio('contact_emailcopy', 1, $pref['contact_emailcopy'])." ".$frm->label(LAN_ENABLED, 'contact_emailcopy', 1)."   ".$frm->radio('contact_emailcopy', 0, !$pref['contact_emailcopy'])." @@ -356,8 +356,8 @@ $text .= "
".PRFLAN_9." + ".PRFLAN_9." ".$frm->textarea('sitedisclaimer', str_replace(array('<', '>', '"'), array('<', '>', '"'), $pref['sitedisclaimer']), 6, 59)."
+
- - + - - + - - + @@ -399,8 +399,8 @@ if(function_exists("memory_get_usage")) { $text .= " - - + @@ -417,36 +417,36 @@ $text .= " $text .= "
".PRFLAN_77." -
".PRFLAN_14." + ".PRFLAN_14." ".$frm->radio_switch('displaythemeinfo', $pref['displaythemeinfo'])."
".PRFLAN_15." + ".PRFLAN_15." ".$frm->radio_switch('displayrendertime', $pref['displayrendertime'])."
".PRFLAN_16." + ".PRFLAN_16." ".$frm->radio_switch('displaysql', $pref['displaysql'])."
".PRFLAN_137." + ".PRFLAN_137." ".$frm->radio_switch('display_memory_usage', $pref['display_memory_usage'])."
+
- - + - - + - - + - - + @@ -468,29 +468,29 @@ $date4 = e107::getDate()->convert(time(),"input"); $text .= "
".PRFLAN_21." -
".PRFLAN_95." + ".PRFLAN_95." ".$frm->radio_switch('admin_alerts_ok', $pref['admin_alerts_ok'])."
".PRFLAN_96."
".PRFLAN_97." + ".PRFLAN_97." ".$frm->radio_switch('admin_alerts_uniquemenu', $pref['admin_alerts_uniquemenu'])."
".PRFLAN_98."
".PRFLAN_199." + ".PRFLAN_199." ".$frm->radio_switch('admin_slidedown_subs', $pref['admin_slidedown_subs'])."
".PRFLAN_200."
".PRFLAN_204." + ".PRFLAN_204." ".$frm->radio_switch('admin_separate_plugins', $pref['admin_separate_plugins'])."
".PRFLAN_205."
+
- - + - - + - - + - - + - - + - - + @@ -596,15 +596,15 @@ $text .= " $text .= "
".PRFLAN_28." -
".PRFLAN_22.": + ".PRFLAN_22.": ".$frm->text('shortdate', $pref['shortdate'], 50)."
".PRFLAN_83.": {$date1}
".PRFLAN_23.": + ".PRFLAN_23.": ".$frm->text('longdate', $pref['longdate'], 50)."
".PRFLAN_83.": {$date2}
".PRFLAN_24." + ".PRFLAN_24." ".$frm->text('forumdate', $pref['forumdate'], 50)."
".PRFLAN_83.": {$date3}
".PRFLAN_25." ".PRFLAN_93."
@@ -551,8 +551,8 @@ $text .= " $text .= "
Date/Time Input-Field format: + Date/Time Input-Field format: ".$frm->selectbox('inputdate',$inputdate, e107::getPref('inputdate')); $text .= $frm->selectbox('inputtime',$inputtime, e107::getPref('inputtime')); @@ -561,8 +561,8 @@ $text .= "
".PRFLAN_26." + ".PRFLAN_26." ".$frm->select_open('time_offset', 'class=tbox select time-offset');//use form handler because of the tabindex $toffset = array("-12", "-11", "-10", "-9", "-8", "-7", "-6", "-5", "-4", "-3", "-2", "-1", "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10", "+11", "+12", "+13", "+14", "+15", "+16"); if(! isset($pref['time_offset'])) @@ -581,8 +581,8 @@ $text .= "
".PRFLAN_56.": + ".PRFLAN_56.": ".$frm->text('timezone', $pref['timezone'], 50)."
+
- - + @@ -612,8 +612,8 @@ $text .= " - - + - - + - - + - - + - - + - - + - - + - - + @@ -688,8 +688,8 @@ $text .= " - - + @@ -780,15 +780,15 @@ $text .= "
Social Login Options
Note: This section is not functional at the moment
-
".PRFLAN_29." + ".PRFLAN_29." ".$frm->radio_switch('user_reg', $pref['user_reg'])."
".PRFLAN_30."
".PRFLAN_154." + ".PRFLAN_154." ".$frm->select_open('user_reg_veri'); $veri_list = array(PRFLAN_152,PRFLAN_31,PRFLAN_153); @@ -628,8 +628,8 @@ $text .= "
".PRFLAN_184."".$frm->select_open('allowEmailLogin'); + ".PRFLAN_184."".$frm->select_open('allowEmailLogin'); // $login_list = array(PRFLAN_201,PRFLAN_202,PRFLAN_203); $login_list = array( 2 => PRFLAN_203, @@ -645,42 +645,42 @@ $text .= "
".PRFLAN_160." + ".PRFLAN_160." ".$frm->radio_switch('signup_remote_emailcheck', $pref['signup_remote_emailcheck'])."
".PRFLAN_167." + ".PRFLAN_167." ".$frm->radio_switch('disable_emailcheck', $pref['disable_emailcheck'])."
".PRFLAN_45." + ".PRFLAN_45." ".$frm->radio_switch('use_coppa', $pref['use_coppa'])."
".PRFLAN_46." ".PRFLAN_94."
".PRFLAN_58." + ".PRFLAN_58." ".$frm->radio_switch('membersonly_enabled', $pref['membersonly_enabled'])."
".PRFLAN_59."
".PRFLAN_206." + ".PRFLAN_206." ".$frm->textarea('membersonly_exceptions', $pref['membersonly_exceptions'], 3, 1)."
".PRFLAN_207."
".PRFLAN_197.": + ".PRFLAN_197.": ".$frm->radio_switch('autologinpostsignup', $pref['autologinpostsignup'])."
".PRFLAN_198."
".PRFLAN_136." + ".PRFLAN_136." ".$frm->number('signup_maxip', $pref['signup_maxip'], 3)."
".PRFLAN_78."
+
- - + "; @@ -805,8 +805,8 @@ $text .= " $text .= " - - +
Enable Social Logins + Enable Social Logins ".$frm->radio_switch('social_login_active', $pref['social_login_active'])."
".$label." + ".$label." "; foreach($val as $k=>$v) { @@ -861,65 +861,65 @@ $text .= " $text .= "
".PRFLAN_19." - +
- - + - - + - - + - - + - - + - - + - - + - - + @@ -928,8 +928,8 @@ $text .= " /* */ @@ -949,8 +949,8 @@ $text .= " { $text .= " - - +
".PRFLAN_126." + ".PRFLAN_126." ".$frm->textarea('signup_text', $pref['signup_text'], 3, 1)."
".PRFLAN_140." + ".PRFLAN_140." ".$frm->textarea('signup_text_after', $pref['signup_text_after'], 3, 1)."
".CUSTSIG_16." + ".CUSTSIG_16." ".$frm->number('signup_pass_len', $pref['signup_pass_len'], 2)."
".CUSTSIG_18." + ".CUSTSIG_18." ".$frm->textarea('signup_disallow_text', $pref['signup_disallow_text'], 3, 1)."
".CUSTSIG_19."
".PRFLAN_155.": + ".PRFLAN_155.":
".$e_userclass->uc_dropdown('displayname_class', $pref['displayname_class'], 'nobody,member,admin,classes', "tabindex='".$frm->getNext()."'")."
".$frm->admin_button('submit_resetdisplaynames', PRFLAN_156)."
".PRFLAN_192.": + ".PRFLAN_192.": ".$frm->text('predefinedLoginName', $pref['predefinedLoginName'], 50)."
".PRFLAN_193."
".PRFLAN_194."
".PRFLAN_158.": + ".PRFLAN_158.": ".$frm->number('displayname_maxlength', $pref['displayname_maxlength'], 3)."
".PRFLAN_172.": + ".PRFLAN_172.": ".$frm->number('loginname_maxlength', $pref['loginname_maxlength'], 3)."
".$key." + ".$key." ".$frm->radio($value, 0, !$pref[$value]).$frm->label(CUSTSIG_12, $value, 0)."   ".$frm->radio($value, 1, ($pref[$value] == 1)).$frm->label(CUSTSIG_14, $value, 1)."   ".$frm->radio($value, 2, ($pref[$value] == 2)).$frm->label(CUSTSIG_15, $value, 2)." @@ -980,101 +980,101 @@ if(!isset($pref['post_html'])) $text .= "
".PRFLAN_101." - +
- - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + @@ -1086,15 +1086,15 @@ if(file_exists(e_PLUGIN."geshi/geshi.php")) { $text .= " - - + - - + @@ -1127,23 +1127,23 @@ $hasGD = extension_loaded("gd"); $text .= "
".PRFLAN_47." -
".PRFLAN_127.": + ".PRFLAN_127.": ".$frm->radio_switch('make_clickable', $pref['make_clickable'])."
".PRFLAN_128."
".PRFLAN_102."?: + ".PRFLAN_102."?: ".$frm->radio_switch('link_replace', $pref['link_replace'])."
".PRFLAN_103."
".PRFLAN_145."?: + ".PRFLAN_145."?: ".$frm->radio_switch('links_new_window', $pref['links_new_window'])."
".PRFLAN_146."
".PRFLAN_104.": + ".PRFLAN_104.": ".$frm->text('link_text', $pref['link_text'], 200)."
".PRFLAN_105."
".PRFLAN_107.": + ".PRFLAN_107.": ".$frm->text('email_text', $tp->post_toForm($pref['email_text']), 200)."
".PRFLAN_108."
".PRFLAN_109.": + ".PRFLAN_109.": ".$frm->text('main_wordwrap', $pref['main_wordwrap'], 3)."
".PRFLAN_110."
".PRFLAN_111.": + ".PRFLAN_111.": ".$frm->text('menu_wordwrap', $pref['menu_wordwrap'], 3)."
".PRFLAN_110."
".PRFLAN_116.": + ".PRFLAN_116.": ".$e_userclass->uc_dropdown('post_html', $pref['post_html'], 'nobody,public,member,admin,main,classes', "tabindex='".$frm->getNext()."'")."
".PRFLAN_117."
".PRFLAN_215.": + ".PRFLAN_215.": ".r_userclass('post_script',$pref['post_script'],'off','nobody,member,admin,main,classes')."
".PRFLAN_216."
".PRFLAN_217.": + ".PRFLAN_217.": ".$frm->radio_switch('filter_script', varset($pref['filter_script'], 1))."
".PRFLAN_218."
".PRFLAN_220.": + ".PRFLAN_220.": ".$frm->radio_switch('html_abuse', varset($pref['html_abuse'], 1))."
".PRFLAN_221."
".PRFLAN_122.": + ".PRFLAN_122.": ".$frm->radio_switch('wysiwyg', $pref['wysiwyg'])."
".PRFLAN_123."
".PRFLAN_124.": + ".PRFLAN_124.": ".$frm->radio_switch('old_np', $pref['old_np'])."
".PRFLAN_125."
".PRFLAN_118."?: + ".PRFLAN_118."?: ".$frm->radio_switch('useGeshi', $pref['useGeshi'])."
".PRFLAN_119."
".PRFLAN_120."?: + ".PRFLAN_120."?: ".$frm->text('defaultLanGeshi', ($pref['defaultLanGeshi'] ? $pref['defaultLanGeshi'] : "php"), 20)."
".PRFLAN_121."
+
- + - - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + @@ -1313,55 +1313,55 @@ $text .= " $text .= "
".PRFLAN_87." -
".PRFLAN_60."".PRFLAN_60." + ".$frm->radio_switch('ssl_enabled', $pref['ssl_enabled'])."
".PRFLAN_61."
".PRFLAN_76.": + ".PRFLAN_76.": "; if($hasGD) @@ -1158,8 +1158,8 @@ $text .= "
".PRFLAN_81.": + ".PRFLAN_81.": "; if($hasGD) @@ -1174,8 +1174,8 @@ $text .= "
".PRFLAN_138.": + ".PRFLAN_138.": "; if($hasGD) { @@ -1190,37 +1190,37 @@ $text .= "
".PRFLAN_92.": + ".PRFLAN_92.": ".$frm->radio_switch('user_reg_secureveri', $pref['user_reg_secureveri'])."
".PRFLAN_129.": + ".PRFLAN_129.": ".$frm->radio_switch('disallowMultiLogin', $pref['disallowMultiLogin'], LAN_YES, LAN_NO)."
".PRFLAN_130."
".PRFLAN_48.": + ".PRFLAN_48.":
".$frm->radio_multi('user_tracking', array('cookie' => PRFLAN_49, 'session' => PRFLAN_50), $pref['user_tracking'])."
".PRFLAN_55.":
".$frm->text('cookie_name', $pref['cookie_name'], 20)."
".PRFLAN_188.": + ".PRFLAN_188.": ".$frm->radio_switch('passwordEncoding', varset($pref['passwordEncoding'], 0), PRFLAN_190, PRFLAN_189)."
".PRFLAN_191."
".PRFLAN_178." + ".PRFLAN_178." ".$frm->select_open('password_CHAP'); //TODO - user tracking session name - visible only if Cookie is enabled (JS) $CHAP_list[0] = PRFLAN_180; @@ -1240,42 +1240,42 @@ $text .= "
".PRFLAN_40." + ".PRFLAN_40." ".$frm->radio_switch('profanity_filter', $pref['profanity_filter'])."
".PRFLAN_41."
".PRFLAN_42.": + ".PRFLAN_42.": ".$frm->text('profanity_replace', $pref['profanity_replace'], 20)."
".PRFLAN_43.": + ".PRFLAN_43.": ".$frm->tags('profanity_words', $pref['profanity_words'])."
".PRFLAN_44."
".PRFLAN_35.": + ".PRFLAN_35.": ".$frm->radio_switch('antiflood1', $pref['antiflood1'])."
".PRFLAN_36.": + ".PRFLAN_36.": ".$frm->number('antiflood_timeout', $pref['antiflood_timeout'], 3)."
".PRFLAN_38."
".PRFLAN_37." + ".PRFLAN_37." ".$frm->select_open('autoban'); $autoban_list = array( @@ -1299,8 +1299,8 @@ $text .= "
".PRFLAN_139.": + ".PRFLAN_139.": ".$frm->radio_switch('adminpwordchange', $pref['adminpwordchange'])."
+
- - + - - + - - + - - + - - + - - + - - + - - +
Allow users to post comments: + Allow users to post comments: ".$frm->radio_switch('comments_disabled', $pref['comments_disabled'], LAN_NO, LAN_YES,array('reverse'=>1))."
".PRFLAN_32." + ".PRFLAN_32." ".$frm->radio_switch('anon_post', $pref['anon_post'], LAN_YES, LAN_NO)."
".PRFLAN_33."
".PRFLAN_89.": + ".PRFLAN_89.": ".$frm->radio_switch('comments_icon', $pref['comments_icon'], LAN_YES, LAN_NO)."
".PRFLAN_88.": + ".PRFLAN_88.": ".$frm->radio_switch('nested_comments', $pref['nested_comments'], LAN_YES, LAN_NO)."
".PRFLAN_90.": + ".PRFLAN_90.": ".$frm->radio_switch('allowCommentEdit', $pref['allowCommentEdit'], LAN_YES, LAN_NO)."
".PRFLAN_166.": + ".PRFLAN_166.": ".$frm->radio_switch('comments_emoticons', $pref['comments_emoticons'], LAN_YES, LAN_NO)."
Moderate Comments made by: + Moderate Comments made by: ". $frm->uc_select('comments_moderate', $pref['comments_moderate'],"nobody,guest,new,bots,public,admin,main,classes"). @@ -1370,8 +1370,8 @@ $text .= "
Comment Sorting: "; + Comment Sorting: "; $comment_sort = array( "desc" => "Most recent comments first", //default //TODO LAN @@ -1386,7 +1386,7 @@ $text .= "
".PRFLAN_209." - +
@@ -1394,8 +1394,8 @@ $text .= " - - + @@ -1413,15 +1413,15 @@ $text .= " $text .= "
File Uploading -
".PRFLAN_208.": + ".PRFLAN_208.": ".$e_userclass->uc_dropdown('email_item_class',varset($pref['email_item_class'],e_UC_MEMBER),'nobody,admin,main,public,member,classes', "tabindex='".$frm->getNext()."'")."
+
- - + - - - - + @@ -1459,7 +1459,7 @@ $text .= " $text .= "
Javascript Frameworks (for testing purposes only) -
".UPLLAN_25."". + ".UPLLAN_25."". $frm->radio_switch('upload_enabled', $pref['upload_enabled'], LAN_YES, LAN_NO) ." @@ -1430,9 +1430,9 @@ $text .= "
".UPLLAN_33."
+ 		".UPLLAN_33."
". + ". $frm->text('upload_maxfilesize', $pref['upload_maxfilesize'], 10) ."
".UPLLAN_34." (upload_max_filesize = ".ini_get('upload_max_filesize').", post_max_size = ".ini_get('post_max_size')." )
@@ -1440,8 +1440,8 @@ $text .= "
".UPLLAN_37."".r_userclass("upload_class", $pref['upload_class'],"off","nobody,public,guest,member,admin,classes")." + ".UPLLAN_37."".r_userclass("upload_class", $pref['upload_class'],"off","nobody,public,guest,member,admin,classes")."
".UPLLAN_38."
+
@@ -1503,36 +1503,36 @@ $text .= " $text .= "
- +
- - + - - + - - + - - + @@ -1572,29 +1572,29 @@ $text .= " $text .= "
".PRFLAN_149." -
Disable scripts consolidation + Disable scripts consolidation ".$frm->radio_switch('e_jslib_nocombine', $pref['e_jslib_nocombine'], LAN_YES, LAN_NO)."
If disabled, scripts will be loaded in one consolidated file
Enable consolidated scripts zlib compression: + Enable consolidated scripts zlib compression: ".$frm->radio_switch('e_jslib_gzip', $pref['e_jslib_gzip'], LAN_YES, LAN_NO)."
Used only when script consolidation is enabled
Disable consolidated scripts server cache: + Disable consolidated scripts server cache: ".$frm->radio_switch('e_jslib_nocache', $pref['e_jslib_nocache'], LAN_YES, LAN_NO)."
Used only when script consolidation is enabled
Disable consolidated scripts browser cache: + Disable consolidated scripts browser cache: ".$frm->radio_switch('e_jslib_nobcache', $pref['e_jslib_nobcache'], LAN_YES, LAN_NO)."
Used only when script consolidation is enabled
+
- - + - - + - - + @@ -1618,14 +1618,14 @@ else $text .= " - - + - - + diff --git a/e107_admin/search.php b/e107_admin/search.php index 9a883e804..746cd029c 100644 --- a/e107_admin/search.php +++ b/e107_admin/search.php @@ -201,66 +201,66 @@ if ($query[0] == 'settings')
".SEALAN_20." -
".PRFLAN_147.": + ".PRFLAN_147.": ".$frm->radio_switch('developer', $pref['developer'])."
".PRFLAN_148."
".PRFLAN_196." + ".PRFLAN_196." ".$frm->radio_switch('log_page_accesses', $pref['log_page_accesses'])."
".PRFLAN_196a." ".e_LOG_ABS."
".PRFLAN_17." + ".PRFLAN_17." ".$frm->radio_switch('compress_output', $pref['compress_output'])."
".PRFLAN_150." + ".PRFLAN_150." {$auth_dropdown}
".PRFLAN_173." + ".PRFLAN_173." ".$frm->radio_switch('check_updates', $pref['check_updates'])."
+
- - + - - + - - + - - + - - + - - + - - + - - + - - + @@ -301,33 +301,33 @@ elseif ($query[0] == 'edit')
{$caption} -
".SEALAN_15.": + ".SEALAN_15.": ".$e_userclass->uc_dropdown('search_restrict', $pref['search_restrict'], 'public,guest,nobody,member,admin,classes', "tabindex='".$frm->getNext()."'")."
".SEALAN_30." + ".SEALAN_30." ".$frm->radio_switch('search_highlight', $pref['search_highlight'])."
".SEALAN_10." + ".SEALAN_10." ".$frm->radio_switch('relevance', $search_prefs['relevance'])."
".SEALAN_11." + ".SEALAN_11." ".$frm->radio_switch('user_select', $search_prefs['user_select'])."
".SEALAN_19." + ".SEALAN_19." ".$frm->radio_switch('multisearch', $search_prefs['multisearch'])."
".SEALAN_35." + ".SEALAN_35." ".$frm->radio_multi('selector', array(2 => SEALAN_36, 1 => SEALAN_37, 0 => SEALAN_38), $search_prefs['selector'])."
".SEALAN_12." + ".SEALAN_12." ".$frm->radio_multi('time_restrict', array(0 => LAN_DISABLED, 1 => SEALAN_13), $search_prefs['time_restrict'])."  ".$frm->text('time_secs', $tp -> toForm($search_prefs['time_secs']), 3, 'class=tbox&size=5')." ".SEALAN_14."
".SEALAN_3." + ".SEALAN_3." ".$frm->radio_switch('search_sort', $search_prefs['mysql_sort'], 'MySql', SEALAN_31)."  ".$frm->text('php_limit', $tp -> toForm($search_prefs['php_limit']), 5, 'class=tbox&size=5')." ".SEALAN_32."
".SEALAN_49."
".SEALAN_47." + ".SEALAN_47." ".$frm->radio_switch('boundary', $search_prefs['boundary'])."
".SEALAN_48."
+
- - + - - + - - + - - + + + + +
".SEALAN_44.": + ".SEALAN_44.": ".r_userclass("class", $search_prefs[$handler_type][$query[2]]['class'], "off", "public,guest,nobody,member,admin,classes")."
".SEALAN_45.": + ".SEALAN_45.":
".SEALAN_46.": + ".SEALAN_46.":
".SEALAN_26.": + ".SEALAN_26.":

@@ -354,7 +354,7 @@ else
".SEALAN_1." - +
@@ -440,7 +440,7 @@ else
".SEALAN_1." -
+
diff --git a/e107_admin/ugflag.php b/e107_admin/ugflag.php index dc7a621f1..1b5045fe5 100644 --- a/e107_admin/ugflag.php +++ b/e107_admin/ugflag.php @@ -77,7 +77,7 @@ $text = "
".UGFLAN_4." -
+
@@ -90,8 +90,8 @@ $elements = array(e_UC_PUBLIC=>LAN_DISABLED, $text .= " - - + "; @@ -99,10 +99,10 @@ $text .= " //TODO multilanguage pref $text .= " - - diff --git a/e107_admin/updateadmin.php b/e107_admin/updateadmin.php index 7bdcf4fb9..151ef1ff0 100644 --- a/e107_admin/updateadmin.php +++ b/e107_admin/updateadmin.php @@ -27,6 +27,7 @@ require_once(e_HANDLER.'message_handler.php'); require_once(e_HANDLER.'validator_class.php'); $userMethods = e107::getUserSession(); $emessage = e107::getMessage(); +$frm = e107::getForm(); if (isset($_POST['update_settings'])) { @@ -78,35 +79,36 @@ else
".UDALAN_8." ".ADMINNAME." -
".UGFLAN_2.": + ".UGFLAN_2.": ".$frm->radio_multi('maintainance_flag', $elements, $pref['maintainance_flag'], TRUE)."
".UGFLAN_5." + ".UGFLAN_5." + ".$frm->bbarea('maintainance_text', $pref['maintainance_text'], 'maintenance', 'maintenance_bbhelp')."
".UGFLAN_6."
+
- - + - - + - - +
".UDALAN_4.": + ".UDALAN_4.": ".ADMINNAME."
".UDALAN_5.": + ".UDALAN_5.":
".UDALAN_6.": + ".UDALAN_6.":
- - + ". + $frm->admin_button('update_settings','no-value','update',UDALAN_7)." +
diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php index 7a505ca13..84843ec84 100644 --- a/e107_admin/userclass2.php +++ b/e107_admin/userclass2.php @@ -412,7 +412,7 @@ switch ($action) $text = "
- +
@@ -502,7 +502,7 @@ switch ($action) if($params == 'edit') { $text .= $frm->admin_button('createclass', UCSLAN_14, 'create'); - $text .= $frm->admin_button('updatecancel', LAN_CANCEL, 'create'); + $text .= $frm->admin_button('updatecancel', LAN_CANCEL, 'cancel'); // $text .= ""; // $text .= "  "; $text .= " @@ -512,7 +512,7 @@ if($params == 'edit') else { $text .= $frm->admin_button('createclass', UCSLAN_15, 'create'); - $text .= $frm->admin_button('updatecancel', LAN_CANCEL, 'create'); + $text .= $frm->admin_button('updatecancel', LAN_CANCEL, 'cancel'); // $text .= " //   "; $text .= " @@ -548,7 +548,8 @@ $ns->tablerender(UCSLAN_21, $text); $text = "
-
- + + + +
"; + +
"; $text .= UCSLAN_43; if (count($icn) > 0) { @@ -571,7 +572,8 @@ $ns->tablerender(UCSLAN_21, $text); \n"; $text .= "
"; +
". + $frm->admin_button('set_initial_classes','no-value','create',LAN_UPDATE); } else { @@ -591,7 +593,7 @@ $ns->tablerender(UCSLAN_21, $text); $text .= $e_userclass->show_graphical_tree(TRUE); // Print with debug options $ns->tablerender(UCSLAN_21, $text); - $text = " + $text = "
Class rights for first 20 users in database
"; $sql->db_Select('user','user_id,user_name,user_class',"ORDER BY user_id LIMIT 0,20",'no_where'); while ($row = $sql->db_Fetch()) @@ -647,34 +649,49 @@ $ns->tablerender(UCSLAN_21, $text); $ns->tablerender("", "
".$message."
"); } + $mes = e107::getMessage(); + + $mes->addWarning(UCSLAN_52."
".UCSLAN_53); $text = " -
Class rights for first 20 users in database
User IDDisp NameRaw classesInherited classesEditable classes
+
- - + + - - -
".UCSLAN_52."
".UCSLAN_53."
".UCSLAN_54."
".UCSLAN_57."
- - 		".UCSLAN_55."
".UCSLAN_56."
- +
".UCSLAN_54."
".UCSLAN_57."
+ 		+ ".$frm->admin_button('add_class_tree','no-value','delete', UCSLAN_58)."
"; - $ns->tablerender(UCSLAN_61, $text); +
".UCSLAN_55."
".UCSLAN_56."
+ 		+ ".$frm->admin_button('flatten_class_tree','no-value','delete', UCSLAN_58)." +
"; + + $ns->tablerender(UCSLAN_61, $mes->render().$text); $text = "
- +
- - + + - - -
".UCSLAN_72."
".UCSLAN_73."		 - -
"; +
".UCSLAN_72."
+ ".UCSLAN_73." + 		+ ".$frm->admin_button('rebuild_tree','no-value','delete', UCSLAN_58)." +
+ "; + $ns->tablerender(UCSLAN_71, $text); break; // End of 'options' @@ -917,7 +934,7 @@ class uclass_manager $text .= "
".UCSLAN_5." - ". +
". $frm->colGroup($this->fields,$this->fieldpref). $frm->thead($this->fields,$this->fieldpref). diff --git a/e107_admin/users.php b/e107_admin/users.php index d6e3eebf3..510098b00 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -809,7 +809,7 @@ class users_admin_ui extends e_admin_ui $text = "
".$rs->form_open("post",e_SELF.(e_QUERY ? '?'.e_QUERY : ''),"adduserform")." -
+
@@ -921,7 +921,7 @@ class users_admin_ui extends e_admin_ui $text = "
-
+
@@ -1777,7 +1777,7 @@ class users $e_userclass = new user_class; // TODO - The search field (not the userclass drop-down) should be replaced with a generic ajax search-filter class element. $text = " -
\n"; +
\n"; $text .= "
\n"; $list = $e_userclass->uc_required_class_list("public,member,admin,main,classes"); @@ -1909,7 +1909,7 @@ class users $text .= "
- ". +
". $frm->colGroup($this->fields,$this->fieldpref). $frm->thead($this->fields,$this->fieldpref,"action=main&sub=[FIELD]&id=[ASC]&filter=".intval($_GET['filter']).'&srch='.$_GET['srch']."&frm=[FROM]"). "\n"; @@ -2122,7 +2122,7 @@ class users $pref['memberlist_access'] = varset($pref['memberlist_access'],e_UC_MEMBER); $text = "
-
+
@@ -2267,7 +2267,7 @@ class users if (!is_object($e_userclass)) $e_userclass = new user_class; $text = "
".$rs->form_open("post",e_SELF.(e_QUERY ? '?'.e_QUERY : ''),"adduserform")." -
+
@@ -2701,7 +2701,7 @@ class users $caption = UCSLAN_6." ".$row['user_name']." (".$row['user_class'].")"; $text = "
-
+
@@ -2995,7 +2995,7 @@ function showRanks()
-
". +
". $frm->colGroup($fields, array_keys($fields)). $frm->thead($fields, array_keys($fields)); foreach ($fieldList['core'] as $k => $f) @@ -3004,7 +3004,7 @@ function showRanks() - - + "; } @@ -3030,7 +3030,7 @@ function showRanks() - - @@ -3070,7 +3070,7 @@ function showRanks() $text .= " -
".USRLAN_204." {$f} +
".USRLAN_205." {$f} + +
". +
". $frm->colGroup($fields, array_keys($fields)). $frm->thead($fields, array_keys($fields)); @@ -3079,13 +3079,13 @@ function showRanks() $pfx = ($info['lan_pfx'] ? "checked='checked'" : ''); $text .= " - - + - - - + + + "; $info = $ranks['special'][2]; @@ -3093,13 +3093,13 @@ function showRanks() $pfx = ($info['lan_pfx'] ? "checked='checked'" : ''); $text .= " - - + - - - + + + @@ -3110,14 +3110,14 @@ function showRanks() $pfx_checked = ($r['lan_pfx'] ? "checked='checked'" : ''); $text .= " - - + - - - + + @@ -3126,14 +3126,14 @@ function showRanks() $text .= " - + - - - - - + + + + +
".LAN_MAINADMIN." + ".LAN_MAINADMIN." N/A".RankImageDropdown($imageList,'calc_img[main_admin]',$info['image'])."N/A".RankImageDropdown($imageList,'calc_img[main_admin]',$info['image'])."
".LAN_ADMIN." + ".LAN_ADMIN." N/A".RankImageDropdown($imageList,'calc_img[admin]',$info['image'])."N/A".RankImageDropdown($imageList,'calc_img[admin]',$info['image'])."
 
".USRLAN_212." + ".USRLAN_212." ".RankImageDropdown($imageList,"calc_img[$k]",$r['image'])." ". + ".RankImageDropdown($imageList,"calc_img[$k]",$r['image'])." ". $frm->submit_image("delete_rank[{$r['id']}]",LAN_DELETE,'delete',LAN_CONFIRMDEL.": [{$r['name']}]?")."
  
".USRLAN_214."".RankImageDropdown($imageList,'new_calc_img')."".USRLAN_214."".RankImageDropdown($imageList,'new_calc_img')."
diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php index ca830899b..5f1e8cb98 100755 --- a/e107_admin/users_extended.php +++ b/e107_admin/users_extended.php @@ -425,7 +425,7 @@ class users_ext $text .= " - +
@@ -536,7 +536,7 @@ class users_ext
"; $text .= " -
".EXTLAN_1."
+
@@ -824,7 +824,7 @@ class users_ext $text = "
"; $text .= " -
+
@@ -909,7 +909,7 @@ class users_ext "; $text .= "

-
+
@@ -1034,7 +1034,7 @@ class users_ext $txt = " -
+
diff --git a/e107_admin/ver.php b/e107_admin/ver.php index c9b4b9e05..f120a1b0f 100644 --- a/e107_admin/ver.php +++ b/e107_admin/ver.php @@ -16,6 +16,6 @@ if (!defined('e107_INIT')) { exit; } -$e107info['e107_version'] = "0.8.0 (cvs)"; +$e107info['e107_version'] = "2.0.0 (git)"; ?> \ No newline at end of file diff --git a/e107_admin/wmessage.php b/e107_admin/wmessage.php index d008eb52c..9869cb9de 100644 --- a/e107_admin/wmessage.php +++ b/e107_admin/wmessage.php @@ -106,7 +106,7 @@ if ($action == "main" || $action == "") $wmList = $sql->db_getList(); $text = $rs->form_open('post', e_SELF, 'myform_wmessage', '', ''); $text .= "
-
+
@@ -159,7 +159,7 @@ if ($action == "create" || $action == "edit")
-
+
@@ -216,7 +216,7 @@ if ($action == "opt") { $text = "
\n
-
+
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 23a2c0a16..17317a796 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -1224,11 +1224,11 @@ class admin_shortcodes // MAIN LINK $menu_vars = array(); - $menu_vars['main']['text'] = ADLAN_151; - $menu_vars['main']['link'] = e_ADMIN_ABS.'admin.php'; - $menu_vars['main']['image'] = "".ADLAN_151.""; - $menu_vars['main']['image_src'] = ADLAN_151; - $menu_vars['main']['perm'] = ''; + $menu_vars['adminhome']['text'] = ADLAN_151; + $menu_vars['adminhome']['link'] = e_ADMIN_ABS.'admin.php'; + $menu_vars['adminhome']['image'] = "".ADLAN_151.""; + $menu_vars['adminhome']['image_src'] = ADLAN_151; + $menu_vars['adminhome']['perm'] = ''; //ALL OTHER ROOT LINKS - temporary data transformation - data structure will be changed in the future and this block will be removed diff --git a/e107_handlers/db_verify_class.php b/e107_handlers/db_verify_class.php index 1d4b4f748..965d54ddd 100644 --- a/e107_handlers/db_verify_class.php +++ b/e107_handlers/db_verify_class.php @@ -369,7 +369,7 @@ class db_verify
".DBVLAN_16." -
+
@@ -870,7 +870,7 @@ class db_verify
".DBVLAN_14." -
+
@@ -935,7 +935,7 @@ function check_tables($what) { // $k is the DB table name (less prefix) $ttcount = 0; $ttext = " -
+
@@ -1345,7 +1345,7 @@ $text = "
".DBVLAN_14." -
+
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index c1745c8bb..d0b8dabd1 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -1105,6 +1105,9 @@ class e_form switch ($action) { case 'update': + case 'create': + case 'import': + case 'submit': $options['class'] .= 'btn-success'; break; @@ -2565,7 +2568,7 @@ class e_form
".vartrue($fdata['legend'])." ".vartrue($fdata['table_pre'])." -
+
@@ -2636,10 +2639,10 @@ class e_form } $text .= " - - @@ -2783,7 +2786,7 @@ class e_form if(vartrue($fdata['table_rows']) || vartrue($fdata['table_body'])) { $text .= " -
+ ".$required."".defset($att['title'], $att['title'])."".$label." + ".$this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()))." {$help}
+
{$colgroup} ".vartrue($fdata['table_head'])." diff --git a/e107_handlers/mailout_admin_class.php b/e107_handlers/mailout_admin_class.php index 47909179e..f9264801b 100644 --- a/e107_handlers/mailout_admin_class.php +++ b/e107_handlers/mailout_admin_class.php @@ -1022,7 +1022,7 @@ class mailoutAdminClass extends e107MailManager $text .= "
-
+
@@ -1093,7 +1093,7 @@ class mailoutAdminClass extends e107MailManager $text .= "
-
"; +
"; $fieldPrefs = $this->calcFieldSpec($type, TRUE); // Get columns to display @@ -1241,7 +1241,7 @@ class mailoutAdminClass extends e107MailManager $text .= "
-
+
@@ -1304,7 +1304,7 @@ class mailoutAdminClass extends e107MailManager $text = " ".LAN_MAILOUT_242."
-
+
@@ -1392,7 +1392,7 @@ class mailoutAdminClass extends e107MailManager $text .= "
-
+
@@ -1424,7 +1424,7 @@ class mailoutAdminClass extends e107MailManager $text .= "
-
"; +
"; $fieldPrefs = $this->calcFieldSpec('recipients', TRUE); // Get columns to display diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php index cafd5d4dd..2dac66fd9 100644 --- a/e107_handlers/user_handler.php +++ b/e107_handlers/user_handler.php @@ -1439,7 +1439,7 @@ class e_userperms foreach($groupedList as $section=>$list) { - $text .= "\t\t
+ $text .= "\t\t
diff --git a/e107_languages/English/admin/lan_lancheck.php b/e107_languages/English/admin/lan_lancheck.php index 19461707e..3496e49ee 100644 --- a/e107_languages/English/admin/lan_lancheck.php +++ b/e107_languages/English/admin/lan_lancheck.php @@ -7,7 +7,7 @@ * */ define("LAN_CHECK_1", "Verify/Edit Language-Pack Files"); // modified in 0.7.6 -// define("LAN_CHECK_2", "Verify"); + define("LAN_CHECK_2", "Verify"); define("LAN_CHECK_3", "Verification of"); define("LAN_CHECK_4", "File missing!"); define("LAN_CHECK_5", "Phrase missing!"); diff --git a/e107_plugins/alt_auth/alt_auth_conf.php b/e107_plugins/alt_auth/alt_auth_conf.php index 0e9b67649..c3cb039a4 100755 --- a/e107_plugins/alt_auth/alt_auth_conf.php +++ b/e107_plugins/alt_auth/alt_auth_conf.php @@ -174,7 +174,7 @@ if ($euf->userCount) $fl = &$euf->fieldDefinitions; $text = "
-
+
diff --git a/e107_plugins/banner/admin_banner.php b/e107_plugins/banner/admin_banner.php index 916f8d481..259b7e418 100644 --- a/e107_plugins/banner/admin_banner.php +++ b/e107_plugins/banner/admin_banner.php @@ -221,7 +221,7 @@ if (!$action) {
".BNRLAN_7." -
+
diff --git a/e107_plugins/gsitemap/admin_config.php b/e107_plugins/gsitemap/admin_config.php index cc092991a..fed1d0160 100644 --- a/e107_plugins/gsitemap/admin_config.php +++ b/e107_plugins/gsitemap/admin_config.php @@ -121,7 +121,7 @@ class gsitemap $text .= " -
+
diff --git a/e107_plugins/pm/pm_conf.php b/e107_plugins/pm/pm_conf.php index 45748f918..aef030285 100755 --- a/e107_plugins/pm/pm_conf.php +++ b/e107_plugins/pm/pm_conf.php @@ -295,7 +295,7 @@ function show_options($pm_prefs) $txt = "
-
+
@@ -369,11 +369,11 @@ function show_options($pm_prefs) - - -
".ADLAN_PM_81." ".form::form_text('pm_option-pm_max_send', 5, $pm_prefs['pm_max_send'], 5)."".ADLAN_PM_82."
+
+ ".e107::getForm()->admin_button('update_prefs','no-value','update',ADLAN_PM_32)." +
"; @@ -387,6 +387,7 @@ function show_options($pm_prefs) function show_limits($pm_prefs) { $sql = e107::getDb(); + $frm = e107::getForm(); if (!isset($pm_prefs['pm_limits'])) { $pm_prefs['pm_limits'] = 0; } @@ -400,12 +401,19 @@ function show_limits($pm_prefs) $txt = "
- - +
+ + + + + + + + - - - - - + "; if (isset($limitList)) @@ -460,17 +464,12 @@ function show_limits($pm_prefs) "; } - $txt .= " - - - - "; - $txt .= '
".ADLAN_PM_36."".ADLAN_PM_37."".ADLAN_PM_38."
".ADLAN_PM_45." @@ -425,11 +433,7 @@ function show_limits($pm_prefs) $txt .= '  '.ADLAN_PM_77."
".ADLAN_PM_36."".ADLAN_PM_37."".ADLAN_PM_38."
- -
+
+ '.$frm->admin_button('updatelimits','no-value','update',ADLAN_PM_42).' +
'; return $txt; @@ -482,6 +481,8 @@ function show_limits($pm_prefs) function add_limit($pm_prefs) { $sql = e107::getDb(); + $frm = e107::getForm(); + if($sql->db_Select('generic', "gen_id as limit_id, gen_datestamp as limit_classnum, gen_user_id as inbox_count, gen_ip as outbox_count, gen_intdata as inbox_size, gen_chardata as outbox_size", "gen_type = 'pm_limit'")) { while($row = $sql->db_Fetch()) @@ -492,18 +493,20 @@ function add_limit($pm_prefs) $txt = "
- - +
+ - + - + + + "; $txt .= " @@ -518,16 +521,15 @@ function add_limit($pm_prefs) ".ADLAN_PM_40." - - - + "; $txt .= '
".ADLAN_PM_36." ".ADLAN_PM_37." ".ADLAN_PM_38."
- -
+
+ '.$frm->admin_button('addlimit','no-value','update',ADLAN_PM_43).' +
'; return $txt; @@ -542,8 +544,8 @@ function show_maint($pmPrefs)
".ADLAN_PM_62."
- - +
+ @@ -576,11 +578,11 @@ function show_maint($pmPrefs) - - -
".ADLAN_PM_78." ".yes_no('pm_maint_attach', '0')."
+
+ ".e107::getForm()->admin_button('pm_maint_execute','no-value','delete',ADLAN_PM_61)." +
"; @@ -815,6 +817,7 @@ function doMaint($opts, $pmPrefs) function pm_conf_adminmenu() { global $action; + if ($action == '') { $action = 'main'; } $var['main']['text'] = ADLAN_PM_54; @@ -829,4 +832,4 @@ function pm_conf_adminmenu() show_admin_menu(ADLAN_PM_12, $action, $var); } -?> +?> \ No newline at end of file diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 836b73fa8..4a0b4639c 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -25,12 +25,15 @@ .smalltext { font-size: 11px; } .nowrap { white-space:nowrap; } -label { background-color:transparent; cursor: pointer; } .core-mainpanel-block { text-align:center; width:100px; float:left; height:48px; display:block;margin:15px; } .core-mainpanel-link-text { font-weight:bold; text-decoration: none; padding:3px } +td.center { text-align:center } +.col-label { + width:40%; +} .sidebar-nav { padding: 9px 0; @@ -54,6 +57,22 @@ label { background-color:transparent; cursor: pointer; } -webkit-filter: grayscale(0%); } +legend { display:none } + +.btn { + vertical-align: top; +} + +input[type='radio'] { + vertical-align:top; +} + +label { + margin-left:5px; + margin-right:10px; + display: inline; +} + /* Core Icons & Image Buttons */ img.icon { border: 0px; vertical-align: middle; } img.icon.list, @@ -67,9 +86,11 @@ img.S128 { width: 128px; height: 128px } img.edit, img.delete, input.delete { } + +.buttons-bar { padding: 10px 0px; background-color: #d0fbfd; } /*******************************************************************************************************************/ /* Admin List Table */ -.adminlist { width:100%; border:1px solid #ddd;} +.adminlist, .adminform { width:100%; border:1px solid #ddd;} .adminlist th { border-bottom:1px solid #ddd; } .adminlist td { border-bottom:1px solid #ddd; border-right: 1px solid #ddd; } .adminlist th.last, @@ -78,6 +99,7 @@ input.delete { } .adminlist thead { background-color:#f2f2f2; } .adminlist tr.even { background-color:#f6f6f6; } .adminlist .col-selection-cont { position: relative; float:right; } + .col-selection-cont .col-selection { text-align:left; background-color: #FCFDFF; border: 1px outset black; width:200px; margin-right:0px; overflow:visible; position: absolute; z-index:101; right:0px;} .col-selection .col-selection-body { padding: 5px; clear: both; } diff --git a/e107_themes/bootstrap/admin_template.php b/e107_themes/bootstrap/admin_template.php index a1fc39db8..95e16734d 100644 --- a/e107_themes/bootstrap/admin_template.php +++ b/e107_themes/bootstrap/admin_template.php @@ -29,7 +29,7 @@ $E_ADMIN_NAVIGATION['start'] = '
    '; $E_ADMIN_NAVIGATION['button'] = '
  • - {LINK_TEXT} + {LINK_TEXT} {SUB_MENU} @@ -52,7 +52,7 @@ $E_ADMIN_NAVIGATION['button_active'] = ' $E_ADMIN_NAVIGATION['button_other'] = '
  • - {LINK_TEXT} + {LINK_TEXT}
    • '; diff --git a/e107_themes/bootstrap/admin_theme.php b/e107_themes/bootstrap/admin_theme.php index 77938e78e..b79603ee8 100644 --- a/e107_themes/bootstrap/admin_theme.php +++ b/e107_themes/bootstrap/admin_theme.php @@ -110,18 +110,9 @@ function tablestyle($caption, $text, $mode) $class = ''; - if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode); + // echo 'mod='.$style; - if($mode == 'core-infopanel_mye107' || $mode == 'core-infopanel_news' || $mode == 'core-infopanel_online') - { - echo ' -
    -
    '.$caption.'
    - '.$text.' -
    - '; - return; - } + if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode); if($mode == 'core-infopanel_latest' || $mode == 'core-infopanel_status') { @@ -134,6 +125,19 @@ function tablestyle($caption, $text, $mode) return; } + if($style == 'core-infopanel') + { + echo ' +
    +
    '.$caption.'
    + '.$text.' +
    + '; + return; + } + + +