diff --git a/e107_admin/admin_log.php b/e107_admin/admin_log.php index c2a7405f5..d7d5358d5 100644 --- a/e107_admin/admin_log.php +++ b/e107_admin/admin_log.php @@ -56,7 +56,7 @@ if(is_array($pref['lan_log_list'])) //... and for any plugins which support it { $file = str_replace('--LAN--', e_LANGUAGE, $file); - echo "orig = ".$file." "; + // echo "orig = ".$file." "; e107::lan($path,'log',true); //include_lan(e_PLUGIN.$path.'/'.$file); } diff --git a/e107_admin/links.php b/e107_admin/links.php index 8d3e26cb7..3b8af6d80 100644 --- a/e107_admin/links.php +++ b/e107_admin/links.php @@ -68,7 +68,7 @@ class links_admin_ui extends e_admin_ui protected $perPage = 0; protected $batchDelete = true; protected $batchCopy = true; - protected $listOrder = 'link_order ASC'; + protected $listOrder = 'link_category,link_order ASC'; protected $listSorting = true; // TODO - should enable the 'sort' icon in the 'options' column. @@ -78,14 +78,14 @@ class links_admin_ui extends e_admin_ui protected $fields = array( 'checkboxes' => array('title'=> '', 'width' => '3%','forced' => true, 'thclass' => 'center first','class' => 'center first'), 'link_button' => array('title'=> LAN_ICON, 'type'=>'icon', 'width'=>'5%', 'thclass' => 'center', 'class'=>'center'), - 'link_id' => array('title'=> ID, 'noedit'=>TRUE), + 'link_id' => array('title'=> LAN_ID, 'noedit'=>TRUE), 'link_name' => array('title'=> LCLAN_15, 'width'=>'auto','type'=>'text', 'required' => true, 'validate' => true), 'link_parent' => array('title'=> 'Sublink of', 'type' => 'method', 'width' => 'auto', 'batch'=>true, 'filter'=>true, 'thclass' => 'left first'), 'link_url' => array('title'=> LCLAN_93, 'width'=>'auto', 'type'=>'text', 'required'=>true,'validate' => true), 'link_sefurl' => array('title'=> LAN_SEFURL, 'type' => 'text', 'width' => 'auto'), 'link_class' => array('title'=> LAN_USERCLASS, 'type' => 'userclass', 'writeParms' => 'classlist=public,guest,nobody,member,classes,admin,main', 'batch'=>true, 'filter'=>true, 'width' => 'auto'), 'link_description' => array('title'=> LCLAN_17, 'type' => 'textarea', 'width' => 'auto'), // 'method'=>'tinymce_plugins', ? - 'link_category' => array('title'=> LCLAN_12, 'type' => 'dropdown', 'batch'=>true, 'filter'=>true, 'width' => 'auto'), + 'link_category' => array('title'=> LAN_TEMPLATE, 'type' => 'dropdown', 'batch'=>true, 'filter'=>true, 'width' => 'auto'), 'link_order' => array('title'=> LAN_ORDER, 'type' => 'number', 'width' => 'auto', 'nolist'=>true), 'link_open' => array('title'=> LCLAN_19, 'type' => 'dropdown', 'width' => 'auto', 'batch'=>true, 'filter'=>true, 'thclass' => 'left first'), 'link_function' => array('title'=> 'Function', 'type' => 'method', 'data'=>'str', 'width' => 'auto', 'thclass' => 'left first'), @@ -111,15 +111,15 @@ class links_admin_ui extends e_admin_ui { $this->fields['link_category']['writeParms'] = array( 1 => "1 - Main", - 2 => "2 - Alt", - 3 => "3 - Alt", + 2 => "2 - Sidebar", + 3 => "3 - Footer", 4 => "4 - Alt", 5 => "5 - Alt", - 6 => "6 - Alt", - 7 => "7 - Alt", - 8 => "8 - Alt", - 9 => "9 - Alt", - 10 => "10 - Alt" + // 6 => "6 - Alt", // If these are required, something is not right with the themeing method. + // 7 => "7 - Alt", + // 8 => "8 - Alt", + // 9 => "9 - Alt", + // 10 => "10 - Alt" ); $this->fields['link_open']['writeParms'] = array( diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index 2652c36af..858af48b1 100644 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -299,7 +299,7 @@ class pluginManager{ $mes->addWarning("This area is experimental and may produce unpredictable results."); - $from = intval($_GET['frm']); + $from = intval(varset($_GET['frm'])); // $file = SITEURLBASE.e_PLUGIN_ABS."release/release.php"; // temporary testing $file = "http://e107.org/feed?frm=".$from; @@ -1317,7 +1317,7 @@ class pluginBuilder $this->special['checkboxes'] = array('title'=> '','type' => null, 'data' => null, 'width'=>'5%', 'thclass' =>'center', 'forced'=> TRUE, 'class'=>'center', 'toggle' => 'e-multiselect', 'fieldpref'=>true); $this->special['options'] = array( 'title'=> LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced'=>TRUE, 'fieldpref'=>true); - if($_GET['newplugin']) + if(vartrue($_GET['newplugin'])) { $this->pluginName = $_GET['newplugin']; } diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php index 8be1476be..1b83f6f91 100644 --- a/e107_admin/prefs.php +++ b/e107_admin/prefs.php @@ -457,21 +457,21 @@ $text .= "
".LAN_MAILOUT_87.":   - + ".LAN_MAILOUT_88.": (".LAN_OPTIONAL.")   - + ".LAN_MAILOUT_89.": (".LAN_OPTIONAL.")   - + @@ -505,7 +505,7 @@ $text .= "
/* FIXME - posting SENDMAIL path triggers Mod-Security rules. // Sendmail. --------------> - $senddisp = ($pref['mailer'] != 'sendmail') ? "style='display:none;'" : ''; + $text .= "
"; $text .= " @@ -517,8 +517,8 @@ $text .= "
"; */ - - $text .= "
+ $senddisp = (varset($pref['mailer']) != 'sendmail') ? "e-hideme" : ''; + $text .= "
Not available in this release
"; @@ -536,7 +536,7 @@ $text .= "
'texthtml' => LAN_MAILOUT_126, 'texttheme' => LAN_MAILOUT_127 ); - $text .= $frm->selectbox('mail_sendstyle', $emFormat,$pref['mail_sendstyle']); + $text .= $frm->selectbox('mail_sendstyle', $emFormat, vartrue($pref['mail_sendstyle'])); $text .= " @@ -1806,7 +1806,7 @@ $text .= " ".PRFLAN_196." ".$frm->radio_switch('log_page_accesses', $pref['log_page_accesses'])." -
".PRFLAN_196a." ".e_LOG_ABS."
+
".PRFLAN_196a." ".e_LOG."
diff --git a/e107_admin/search.php b/e107_admin/search.php index b24a26d67..7d28827a6 100644 --- a/e107_admin/search.php +++ b/e107_admin/search.php @@ -454,14 +454,16 @@ else "; - foreach ($search_prefs['comments_handlers'] as $key => $value) { + foreach ($search_prefs['comments_handlers'] as $key => $value) + { $path = ($value['dir'] == 'core') ? e_HANDLER.'search/comments_'.$key.'.php' : e_PLUGIN.$value['dir'].'/search/search_comments.php'; - if(is_readable($path)){ + if(is_readable($path)) + { require_once($path); } $text .= " - {$comments_title} + ".vartrue($comments_title)." ".r_userclass("comments_handlers[".$key."][class]", $search_prefs['comments_handlers'][$key]['class'], "off", "public,guest,nobody,member,admin,classes")." diff --git a/e107_admin/ugflag.php b/e107_admin/ugflag.php index 5a0c1e9d3..f9b5fe48c 100644 --- a/e107_admin/ugflag.php +++ b/e107_admin/ugflag.php @@ -103,7 +103,7 @@ $text .= " - ".$frm->bbarea('maintainance_text', vartrue($pref['maintainance_text']), 'maintenance', 'maintenance_bbhelp')." + ".$frm->bbarea('maintainance_text', vartrue($pref['maintainance_text']), 'maintenance', 'small')."
".UGFLAN_6."
diff --git a/e107_admin/updateadmin.php b/e107_admin/updateadmin.php index 151ef1ff0..127dfc825 100644 --- a/e107_admin/updateadmin.php +++ b/e107_admin/updateadmin.php @@ -17,7 +17,8 @@ require_once('../class2.php'); -include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); +// include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE); +e107::lan('core','updateadmin',true); $e_sub_cat = 'admin_pass'; @@ -93,8 +94,8 @@ else ".UDALAN_5.": - - + ".$frm->password('a_password','',20,'generate=1&strength=1')." + diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php index 346ede9b3..423c5dc54 100644 --- a/e107_admin/userclass2.php +++ b/e107_admin/userclass2.php @@ -901,7 +901,7 @@ class uclass_manager $this->fields = array( 'userclass_icon' => array('title'=> UCSLAN_68, 'type' => 'icon', 'width' => '5%', 'thclass' => 'center', 'class' => 'center'), - 'userclass_id' => array('title'=> ID, 'type' => 'int', 'width' => '5%', 'thclass' => 'left'), + 'userclass_id' => array('title'=> LAN_ID, 'type' => 'int', 'width' => '5%', 'thclass' => 'left'), 'userclass_name' => array('title'=> UCSLAN_12, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'), 'userclass_description' => array('title'=> UCSLAN_13, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left'), 'userclass_editclass' => array('title'=> UCSLAN_24, 'type' => 'userclass', 'width' => 'auto', 'thclass' => 'left'), diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php index 09e2cf3b2..ef148c275 100755 --- a/e107_admin/users_extended.php +++ b/e107_admin/users_extended.php @@ -523,7 +523,14 @@ class users_ext function show_extended($current = '') // Show existing fields List. { - global $sql, $ns, $ue, $curtype, $tp, $mySQLdefaultdb, $action, $sub_action,$frm; + global $ue, $curtype,$mySQLdefaultdb, $action, $sub_action; + + $sql = e107::getDb(); + $frm = e107::getForm(); + $ns = e107::getRender(); + $tp = e107::getParser(); + + if($current == 'new') { $mode = 'new'; @@ -539,7 +546,7 @@ class users_ext list($current_include, $current_regex, $current_regexfail, $current_hide) = explode("^,^",$current['user_extended_struct_parms']); } - $text .= " + $text = "
"; @@ -552,16 +559,16 @@ class users_ext ".EXTLAN_10.": user_"; - if(is_array($current) && $current['user_extended_struct_name']) + if(is_array($current) && varset($current['user_extended_struct_name'])) { $text .= $current['user_extended_struct_name']." - + "; } else { $text .= " - + "; } $text .= " @@ -572,7 +579,7 @@ class users_ext ".EXTLAN_12.": -
+
".EXTLAN_13." @@ -584,7 +591,7 @@ class users_ext +
".EXTLAN_17."
"; // End of Values. -------------------------------------- $db_hide = ($current['user_extended_struct_type'] == 4) ? "visible" : "none"; @@ -691,7 +699,7 @@ class users_ext ".EXTLAN_16." - + @@ -726,7 +734,7 @@ class users_ext @@ -740,9 +748,9 @@ class users_ext get_attributes($options, $name)." />"; @@ -768,7 +772,7 @@ class e_form } /** - * Bbcode Area. Name, value, template, form-id, size, options array eg. counter + * Bbcode Area. Name, value, template, media-Cat, size, options array eg. counter * IMPORTANT: $$mediaCat is also used is the media-manager category identifier */ function bbarea($name, $value, $template = '', $mediaCat='_common', $size = 'large', $options = array()) @@ -1725,7 +1729,7 @@ class e_form // there is no other way for now - prepare user data if('user' == vartrue($data['type']) /* && isset($data['readParms']['idField'])*/) { - if(is_string($data['readParms'])) parse_str($data['readParms'], $data['readParms']); + if(varset($data['readParms']) && is_string($data['readParms'])) parse_str($data['readParms'], $data['readParms']); if(isset($data['readParms']['idField'])) { $data['readParms']['__idval'] = $fieldvalues[$data['readParms']['idField']]; @@ -1795,7 +1799,7 @@ class e_form { case 'options': - if($attributes['type'] == "method") // Allow override with 'options' function. + if(varset($attributes['type']) == "method") // Allow override with 'options' function. { $attributes['mode'] = "read"; if(isset($attributes['method']) && $attributes['method'] && method_exists($this, $attributes['method'])) diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php index bb5beea6d..f2f81f2eb 100644 --- a/e107_handlers/media_class.php +++ b/e107_handlers/media_class.php @@ -284,8 +284,8 @@ class e_media $qry .= "AND media_cat_class IN (".USERCLASS_LIST.") "; $qry .= "ORDER BY media_cat_order"; - e107::getDb()->db_Select_gen($qry); - while($row = e107::getDb()->db_Fetch(mySQL_ASSOC)) + e107::getDb()->gen($qry); + while($row = e107::getDb()->db_Fetch(MYSQL_ASSOC)) { $id = $row['media_cat_category']; $ret[$id] = $row; diff --git a/e107_plugins/_blank/admin_config.php b/e107_plugins/_blank/admin_config.php index 26186ab6c..1270cb355 100644 --- a/e107_plugins/_blank/admin_config.php +++ b/e107_plugins/_blank/admin_config.php @@ -259,9 +259,9 @@ class plugin_blank_admin_ui extends e_admin_ui */ protected $fields = array( 'checkboxes' => array('title'=> '', 'type' => null, 'data' => null, 'width'=>'5%', 'thclass' =>'center', 'forced'=> TRUE, 'class'=>'center', 'toggle' => 'e-multiselect'), - 'blank_id' => array('title'=> ID, 'type' => 'number', 'data' => 'int', 'width'=>'5%', 'thclass' => '', 'class'=>'center', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable + 'blank_id' => array('title'=> LAN_ID, 'type' => 'number', 'data' => 'int', 'width'=>'5%', 'thclass' => '', 'class'=>'center', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable 'blank_icon' => array('title'=> LAN_ICON, 'type' => 'icon', 'data' => 'str', 'width'=>'5%', 'thclass' => '', 'forced'=> TRUE, 'primary'=>TRUE/*, 'noedit'=>TRUE*/), //Primary ID is not editable - 'blank_type' => array('title'=> 'Type', 'type' => 'method', 'data' => 'str', 'width'=>'auto', 'thclass' => '', 'batch' => TRUE, 'filter'=>TRUE), + 'blank_type' => array('title'=> LAN_TYPE, 'type' => 'method', 'data' => 'str', 'width'=>'auto', 'thclass' => '', 'batch' => TRUE, 'filter'=>TRUE), 'blank_folder' => array('title'=> 'Folder', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'thclass' => ''), 'blank_name' => array('title'=> 'Name', 'type' => 'text', 'data' => 'str', 'width' => 'auto', 'thclass' => ''), 'blank_version' => array('title'=> 'Version', 'type' => 'number', 'data' => 'str', 'width' => 'auto', 'thclass' => ''), @@ -269,7 +269,7 @@ class plugin_blank_admin_ui extends e_admin_ui 'blank_authorURL' => array('title'=> "Url", 'type' => 'url', 'data' => 'str', 'width' => 'auto', 'thclass' => 'left'), 'blank_date' => array('title'=> LAN_DATE, 'type' => 'datestamp', 'data' => 'int', 'width' => 'auto', 'thclass' => '', 'readParms' => 'long', 'writeParms' => 'type=datetime'), 'blank_compatibility' => array('title'=> 'Compatible', 'type' => 'text', 'data' => 'str', 'width' => '10%', 'thclass' => 'center' ), - 'blank_url' => array('title'=> 'File Package', 'type' => 'file', 'data' => 'str', 'width' => '20%', 'thclass' => 'center', 'batch' => TRUE, 'filter'=>TRUE, 'parms' => 'truncate=30', 'validate' => false, 'help' => 'Enter blank URL here', 'error' => 'please, ener valid URL'), + 'blank_url' => array('title'=> LAN_URL, 'type' => 'file', 'data' => 'str', 'width' => '20%', 'thclass' => 'center', 'batch' => TRUE, 'filter'=>TRUE, 'parms' => 'truncate=30', 'validate' => false, 'help' => 'Enter blank URL here', 'error' => 'please, ener valid URL'), 'test_list_1' => array('title'=> 'test 1', 'type' => 'boolean', 'data' => 'int', 'width' => '5%', 'thclass' => 'center', 'batch' => TRUE, 'filter'=>TRUE, 'noedit' => true), 'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'data' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center last', 'forced'=>TRUE) );