mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Notice removal

Browse Source
This commit is contained in:
CaMer0n
2009-11-08 12:08:35 +00:00
parent 5d09cd5137
commit 852204503c
7 changed files with 58 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/admin.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/admin.php,v $
| $Revision: 1.22 $
| $Date: 2009-11-07 02:16:52 $
| $Revision: 1.23 $
| $Date: 2009-11-08 12:08:23 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@@ -217,7 +217,9 @@ function render_links($link, $title, $description, $perms, $icon = FALSE, $mode
function render_clean()
{
global $td;
while ($td <= ADLINK_COLS) {
$text = "";
while ($td <= ADLINK_COLS)
{
$text .= "<td class='td' style='width:20%;'></td>";
$td++;
}

6
e107_admin/comment.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/comment.php,v $
| $Revision: 1.14 $
| $Date: 2009-11-07 11:20:26 $
| $Revision: 1.15 $
| $Date: 2009-11-08 12:08:23 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@@ -79,7 +79,7 @@ class comments_admin_ui extends e_admin_ui
//TODO - finish 'user' type, set 'data' to all editable fields, set 'noedit' for all non-editable fields
protected $fields = array(
'checkboxes' => array('title'=> '', 'type' => null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'),
'comment_id' => array('title'=> ID, 'type' => 'int', 'width' =>'5%', 'forced'=> TRUE),
'comment_id' => array('title'=> LAN_ID, 'type' => 'int', 'width' =>'5%', 'forced'=> TRUE),
'comment_item_id' => array('title'=> "item id", 'type' => 'text', 'width' => '5%'),
'comment_subject' => array('title'=> "subject", 'type' => 'text', 'width' => 'auto', 'thclass' => 'left first'), // Display name
'comment_comment' => array('title'=> "comment", 'type' => 'textarea', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name

15
e107_files/shortcode/batch/admin_shortcodes_class.php
View File

@@ -1,7 +1,7 @@
<?php
/*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id: admin_shortcodes_class.php,v 1.30 2009-11-08 09:14:28 e107coders Exp $
* $Id: admin_shortcodes_class.php,v 1.31 2009-11-08 12:08:30 e107coders Exp $
*
* Admin shortcode batch - class
*/
@@ -116,7 +116,7 @@ class admin_shortcodes
}
else
{
$icon = $e_icon_array[$e_sub_cat];
$icon = varset($e_icon_array[$e_sub_cat]);
}
return $icon;
}
@@ -1072,12 +1072,15 @@ class admin_shortcodes
$handle=opendir(e_DOCS.'English/');
}
$i=1;
while ($file = readdir($handle))
if(varset($handle))
{
if ($file != '.' && $file != '..' && $file != 'CVS')
while ($file = readdir($handle))
{
$text .= adnav_main(str_replace('_', ' ', $file), e_ADMIN.'docs.php?'.$i, E_16_DOCS);
$i++;
if ($file != '.' && $file != '..' && $file != 'CVS')
{
$text .= adnav_main(str_replace('_', ' ', $file), e_ADMIN.'docs.php?'.$i, E_16_DOCS);
$i++;
}
}
}
closedir($handle);

55
e107_handlers/admin_handler.php
View File

@@ -1,41 +1,27 @@
<?php
if (!defined('e107_INIT')) { exit; }
// Multi indice array sort by sweetland@whoadammit.com
if (!function_exists('asortbyindex')) {
function asortbyindex($sortarray, $index) {
$lastindex = count ($sortarray) - 1;
for ($subindex = 0; $subindex < $lastindex; $subindex++) {
$lastiteration = $lastindex - $subindex;
for ($iteration = 0; $iteration < $lastiteration; $iteration++) {
$nextchar = 0;
if (comesafter ($sortarray[$iteration][$index], $sortarray[$iteration + 1][$index])) {
$temp = $sortarray[$iteration];
$sortarray[$iteration] = $sortarray[$iteration + 1];
$sortarray[$iteration + 1] = $temp;
}
}
}
return ($sortarray);
// Better Array-sort by key function by acecream (22-Apr-2003 11:02) http://php.net/manual/en/function.asort.php
if (!function_exists('asortbyindex'))
{
function asortbyindex($array, $key)
{
foreach ($array as $i => $k)
{
$sort_values[$i] = $array[$i][$key];
}
asort ($sort_values);
reset ($sort_values);
while (list ($arr_key, $arr_val) = each ($sort_values))
{
$sorted_arr[] = $array[$arr_key];
}
return $sorted_arr;
}
}
if (!function_exists('comesafter')) {
function comesafter($s1, $s2) {
$order = 1;
if (strlen ($s1) > strlen ($s2)) {
$temp = $s1;
$s1 = $s2;
$s2 = $temp;
$order = 0;
}
for ($index = 0; $index < strlen ($s1); $index++) {
if ($s1[$index] > $s2[$index]) return ($order);
if ($s1[$index] < $s2[$index]) return (1 - $order);
}
return ($order);
}
}
if (!function_exists('multiarray_sort')) {
function multiarray_sort(&$array, $key, $order = 'asc', $natsort = true, $case = true)
@@ -2646,9 +2632,10 @@ class e_admin_form_ui extends e_form
{
$err = "";
$fields = array_keys($this->getController()->getFields());
foreach($fields as $val)
{
if(method_exists(e_form,$val)) // check even if type is not method. - just in case of an upgrade later by 3rd-party.
if(method_exists('e_form',$val)) // check even if type is not method. - just in case of an upgrade later by 3rd-party.
{
$err .= "<h2>ERROR: The field name (".$val.") is not allowed.</h2>";
$err .= "Please rename the key (".$val.") to something else in your fields array and database table.<br /><br />";
@@ -2910,7 +2897,7 @@ class e_admin_form_ui extends e_form
if(count($option) > 0)
{
$text .= "\t".$this->optgroup_open($optdiz[$type].defset($val['title'], $val['title']), $disabled)."\n";
$text .= "\t".$this->optgroup_open($optdiz[$type].defset($val['title'], $val['title']), varset($disabled))."\n";
foreach($option as $okey=>$oval)
{
$text .= $this->option($oval, $okey, $selected == $okey)."\n";

22
e107_handlers/form_handler.php
View File

@@ -9,9 +9,9 @@
* Form Handler
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
* $Revision: 1.70 $
* $Date: 2009-11-06 18:37:23 $
* $Author: secretr $
* $Revision: 1.71 $
* $Date: 2009-11-08 12:08:24 $
* $Author: e107coders $
*
*/
@@ -854,16 +854,16 @@ class e_form
{
if($val == "[FIELD]")
{
$field = $tmp[$key];
$field = varset($tmp[$key]);
}
if($val == "[ASC]")
{
$ascdesc = $tmp[$key];
$ascdesc = varset($tmp[$key]);
}
if($val == "[FROM]")
{
$fromval = $tmp[$key];
$fromval = varset($tmp[$key]);
}
}
@@ -932,7 +932,7 @@ class e_form
{
//Not found
if((!$data['forced'] && !in_array($field, $currentlist)) || $data['nolist'])
if((!varset($data['forced']) && !in_array($field, $currentlist)) || varset($data['nolist']))
{
continue;
}
@@ -949,7 +949,7 @@ class e_form
$tdclass = vartrue($data['class']);
if($field == 'checkboxes') $tdclass = $tdclass ? $tdclass.' autocheck e-pointer' : 'autocheck e-pointer';
$value = $this->renderValue($field, $fieldvalues[$field], $data, $fieldvalues[$pid]);
$value = $this->renderValue($field, varset($fieldvalues[$field]), $data, varset($fieldvalues[$pid]));
if($tdclass)
{
@@ -1300,9 +1300,9 @@ class e_form
$url = (isset($options['url']) ? $tp->replaceConstants($options['url'], 'abs') : e_SELF);
$formurl = $url.($query ? '?'.$query : '');
$fields = $options['fields'];
$current_fields = $options['fieldpref'];
$current_fields = varset($options['fieldpref']) ? $options['fieldpref'] : array_keys($options['fields']);
$text .= "
$text = "
".vartrue($options['form_pre'])."
<form method='post' action='{$formurl}' id='{$elid}-list-form'>
".vartrue($options['fieldset_pre'])."
@@ -1311,7 +1311,7 @@ class e_form
".vartrue($options['table_pre'])."
<table cellpadding='0' cellspacing='0' class='adminlist' id='{$elid}-list-table'>
".$this->colGroup($fields, $current_fields)."
".$this->thead($fields, $current_fields, $options['head_query'], $options['query'])."
".$this->thead($fields, $current_fields, varset($options['head_query']), varset($options['query']))."
<tbody>
";

12
e107_handlers/mysql_class.php
View File

@@ -9,9 +9,9 @@
* mySQL Handler
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/mysql_class.php,v $
* $Revision: 1.60 $
* $Date: 2009-10-29 21:28:09 $
* $Author: e107steved $
* $Revision: 1.61 $
* $Date: 2009-11-08 12:08:24 $
* $Author: e107coders $
*/
if(defined('MYSQL_LIGHT'))
@@ -49,8 +49,8 @@ $db_ConnectionID = NULL; // Stores ID for the first DB connection used - which s
*
* @package e107
* @category e107_handlers
* @version $Revision: 1.60 $
* @author $Author: e107steved $
* @version $Revision: 1.61 $
* @author $Author: e107coders $
*
*/
class e_db_mysql {
@@ -70,7 +70,7 @@ class e_db_mysql {
var $mySQLlanguage;
var $mySQLinfo;
var $tabset;
var $mySQLtablelist = array(); // list of all Db tables.
var $mySQLtableList = array(); // list of all Db tables.
var $mySQLtableListLanguage = array(); // Db table list for the currently selected language

4
e107_languages/English/admin/lan_admin.php
View File

@@ -1,7 +1,7 @@
<?php
/*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id: lan_admin.php,v 1.35 2009-11-08 09:14:39 e107coders Exp $
* $Id: lan_admin.php,v 1.36 2009-11-08 12:08:35 e107coders Exp $
*
* Admin Language File
*/
@@ -309,4 +309,6 @@ define("LAN_NO_RECORDS", "No Records Found");
define("LAN_STATUS", "Status");
define("LAN_URL", "URL");
define("LAN_USER", "User");
define("LAN_ID", "ID");