mirror of
https://github.com/e107inc/e107.git
synced 2025-07-30 19:30:25 +02:00
CSS fixes and some comments
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
+ ----------------------------------------------------------------------------+
|
+ ----------------------------------------------------------------------------+
|
||||||
| e107 website system
|
| e107 website system
|
||||||
|
|
|
|
||||||
| <20>Steve Dunstan 2001-2002
|
| <20>Steve Dunstan 2001-2002
|
||||||
| http://e107.org
|
| http://e107.org
|
||||||
| jalist@e107.org
|
| jalist@e107.org
|
||||||
|
|
|
|
||||||
@@ -11,9 +11,9 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/e107_admin/sql/extended_timezones.php,v $
|
| $Source: /cvs_backup/e107_0.8/e107_admin/sql/extended_timezones.php,v $
|
||||||
| $Revision: 1.1 $
|
| $Revision: 1.2 $
|
||||||
| $Date: 2008-01-15 21:57:15 $
|
| $Date: 2009-09-02 16:39:31 $
|
||||||
| $Author: e107steved $
|
| $Author: e107coders $
|
||||||
+----------------------------------------------------------------------------+
|
+----------------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
if (!defined('e107_INIT')) { exit; }
|
if (!defined('e107_INIT')) { exit; }
|
||||||
@@ -24,6 +24,8 @@ The variable name must be 'timezones_list', and is an array of possible values,
|
|||||||
The text is displayed in a drop-down; the value is returned.
|
The text is displayed in a drop-down; the value is returned.
|
||||||
If function timezones_value() exists, it is called to create the displayed text
|
If function timezones_value() exists, it is called to create the displayed text
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
//FIXME - remove globals.
|
||||||
global $timezones_list;
|
global $timezones_list;
|
||||||
if (!is_array($timezones_list))
|
if (!is_array($timezones_list))
|
||||||
{
|
{
|
||||||
|
@@ -3,7 +3,7 @@
|
|||||||
+ ----------------------------------------------------------------------------+
|
+ ----------------------------------------------------------------------------+
|
||||||
| e107 website system
|
| e107 website system
|
||||||
|
|
|
|
||||||
| <20>Steve Dunstan 2001-2002
|
| <20>Steve Dunstan 2001-2002
|
||||||
| http://e107.org
|
| http://e107.org
|
||||||
| jalist@e107.org
|
| jalist@e107.org
|
||||||
|
|
|
|
||||||
@@ -11,9 +11,9 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/e107_admin/users_extended.php,v $
|
| $Source: /cvs_backup/e107_0.8/e107_admin/users_extended.php,v $
|
||||||
| $Revision: 1.19 $
|
| $Revision: 1.20 $
|
||||||
| $Date: 2009-08-28 16:10:58 $
|
| $Date: 2009-09-02 16:39:31 $
|
||||||
| $Author: marj_nl_fr $
|
| $Author: e107coders $
|
||||||
+----------------------------------------------------------------------------+
|
+----------------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
require_once('../class2.php');
|
require_once('../class2.php');
|
||||||
@@ -381,7 +381,7 @@ class users_ext
|
|||||||
$i=0;
|
$i=0;
|
||||||
$category_name = $this->catList[$cn][0]['user_extended_struct_name'];
|
$category_name = $this->catList[$cn][0]['user_extended_struct_name'];
|
||||||
|
|
||||||
if(count($extendedList)) // Show current extended fields
|
if(count($extendedList[$cn])) // Show current extended fields
|
||||||
{
|
{
|
||||||
foreach($extendedList[$cn] as $ext)
|
foreach($extendedList[$cn] as $ext)
|
||||||
{
|
{
|
||||||
@@ -414,7 +414,7 @@ class users_ext
|
|||||||
}
|
}
|
||||||
$text .= "
|
$text .= "
|
||||||
</td>
|
</td>
|
||||||
<td class='forumheader3' style='width:10%;text-align:center;'>
|
<td class='center' style='width:10%'>
|
||||||
|
|
||||||
<a style='text-decoration:none' href='".e_SELF."?editext.".$id."'>".ADMIN_EDIT_ICON."</a>
|
<a style='text-decoration:none' href='".e_SELF."?editext.".$id."'>".ADMIN_EDIT_ICON."</a>
|
||||||
<input type='image' title='".LAN_DELETE."' name='eudel[".$id."]' src='".ADMIN_DELETE_ICON_PATH."' value='".$name."' onclick='return confirm(\"".EXTLAN_27."\")' />
|
<input type='image' title='".LAN_DELETE."' name='eudel[".$id."]' src='".ADMIN_DELETE_ICON_PATH."' value='".$name."' onclick='return confirm(\"".EXTLAN_27."\")' />
|
||||||
@@ -428,7 +428,7 @@ class users_ext
|
|||||||
{
|
{
|
||||||
$text .= "
|
$text .= "
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan='8' class='forumheader3' style='text-align:center'>".EXTLAN_28."</td>
|
<td colspan='8' class='center'>".EXTLAN_28."</td>
|
||||||
</tr>
|
</tr>
|
||||||
";
|
";
|
||||||
}
|
}
|
||||||
@@ -505,7 +505,7 @@ class users_ext
|
|||||||
|
|
||||||
$text .= "<tr>
|
$text .= "<tr>
|
||||||
<td >".EXTLAN_14."</td>
|
<td >".EXTLAN_14."</td>
|
||||||
<td style='width:70%' class='forumheader3' colspan='3'>
|
<td colspan='3'>
|
||||||
<select onchange='changeHelp(this.value)' class='tbox' name='user_type' id='user_type'>";
|
<select onchange='changeHelp(this.value)' class='tbox' name='user_type' id='user_type'>";
|
||||||
foreach($ue->user_extended_types as $key => $val)
|
foreach($ue->user_extended_types as $key => $val)
|
||||||
{
|
{
|
||||||
@@ -759,14 +759,17 @@ class users_ext
|
|||||||
$text .= "
|
$text .= "
|
||||||
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
<table cellpadding='0' cellspacing='0' class='adminlist'>
|
||||||
|
|
||||||
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<td class='fcaption'>".EXTLAN_1."</td>
|
<th>".EXTLAN_1."</th>
|
||||||
<td class='fcaption'>".EXTLAN_5."</td>
|
<th>".EXTLAN_5."</th>
|
||||||
<td class='fcaption'>".EXTLAN_6."</td>
|
<th>".EXTLAN_6."</th>
|
||||||
<td class='fcaption'>".EXTLAN_7."</td>
|
<th>".EXTLAN_7."</th>
|
||||||
<td class='fcaption'> </td>
|
<th> </td>
|
||||||
<td class='fcaption'>".EXTLAN_8."</td>
|
<th>".EXTLAN_8."</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
";
|
";
|
||||||
$catList = $ue->user_extended_get_categories(FALSE);
|
$catList = $ue->user_extended_get_categories(FALSE);
|
||||||
if(count($catList))
|
if(count($catList))
|
||||||
@@ -783,12 +786,12 @@ class users_ext
|
|||||||
}
|
}
|
||||||
|
|
||||||
$text .= "
|
$text .= "
|
||||||
<td class='forumheader3'>{$ext['user_extended_struct_name']}</td>
|
<td>{$ext['user_extended_struct_name']}</td>
|
||||||
</td>
|
</td>
|
||||||
<td class='forumheader3'>".r_userclass_name($ext['user_extended_struct_applicable'])."</td>
|
<td>".r_userclass_name($ext['user_extended_struct_applicable'])."</td>
|
||||||
<td class='forumheader3'>".r_userclass_name($ext['user_extended_struct_read'])."</td>
|
<td>".r_userclass_name($ext['user_extended_struct_read'])."</td>
|
||||||
<td class='forumheader3'>".r_userclass_name($ext['user_extended_struct_write'])."</td>
|
<td>".r_userclass_name($ext['user_extended_struct_write'])."</td>
|
||||||
<td class='forumheader3'>
|
<td>
|
||||||
<form method='post' action='".e_SELF."?cat'>
|
<form method='post' action='".e_SELF."?cat'>
|
||||||
<input type='hidden' name='id' value='{$ext['user_extended_struct_id']}.{$ext['user_extended_struct_order']}' />
|
<input type='hidden' name='id' value='{$ext['user_extended_struct_id']}.{$ext['user_extended_struct_order']}' />
|
||||||
";
|
";
|
||||||
@@ -805,7 +808,7 @@ class users_ext
|
|||||||
$text .= "
|
$text .= "
|
||||||
</form>
|
</form>
|
||||||
</td>
|
</td>
|
||||||
<td class='forumheader3' style='text-align:center; white-space: nowrap'>
|
<td class='center' style='white-space: nowrap'>
|
||||||
<form method='post' action='".e_SELF."?cat' onsubmit='return confirm(\"".EXTLAN_27."\")'>
|
<form method='post' action='".e_SELF."?cat' onsubmit='return confirm(\"".EXTLAN_27."\")'>
|
||||||
<input type='hidden' name='eu_action' value='delcat' />
|
<input type='hidden' name='eu_action' value='delcat' />
|
||||||
<input type='hidden' name='key' value='{$ext['user_extended_struct_id']},{$ext['user_extended_struct_name']}' />
|
<input type='hidden' name='key' value='{$ext['user_extended_struct_id']},{$ext['user_extended_struct_name']}' />
|
||||||
@@ -822,13 +825,13 @@ class users_ext
|
|||||||
{
|
{
|
||||||
$text .= "
|
$text .= "
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan='8' class='forumheader3' style='text-align:center'>".EXTLAN_37."</td>
|
<td colspan='8' class='center'>".EXTLAN_37."</td>
|
||||||
</tr>
|
</tr>
|
||||||
";
|
";
|
||||||
}
|
}
|
||||||
|
|
||||||
//Show add/edit form
|
//Show add/edit form
|
||||||
$text .= "
|
$text .= "</tbody>
|
||||||
</table>
|
</table>
|
||||||
<form method='post' action='".e_SELF."?".e_QUERY."'>
|
<form method='post' action='".e_SELF."?".e_QUERY."'>
|
||||||
";
|
";
|
||||||
@@ -1050,7 +1053,7 @@ class users_ext
|
|||||||
{
|
{
|
||||||
if (is_readable(e_ADMIN.'sql/extended_'.$f.'.php'))
|
if (is_readable(e_ADMIN.'sql/extended_'.$f.'.php'))
|
||||||
{
|
{
|
||||||
$ret .= (process_sql($f)) ? LAN_CREATED." user_extended_{$f}<br />" : LAN_CREATED_FAILED." user_extended_{$f}<br />";
|
$ret .= ($this->process_sql($f)) ? LAN_CREATED." user_extended_{$f}<br />" : LAN_CREATED_FAILED." user_extended_{$f}<br />";
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1137,6 +1140,8 @@ class users_ext
|
|||||||
|
|
||||||
function headerjs()
|
function headerjs()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
//FIXME
|
||||||
include_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_user_extended.php");
|
include_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_user_extended.php");
|
||||||
$text = "
|
$text = "
|
||||||
<script type='text/javascript'>
|
<script type='text/javascript'>
|
||||||
|
@@ -9,9 +9,9 @@
|
|||||||
* Text processing and parsing functions
|
* Text processing and parsing functions
|
||||||
*
|
*
|
||||||
* $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
|
* $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
|
||||||
* $Revision: 1.58 $
|
* $Revision: 1.59 $
|
||||||
* $Date: 2009-08-20 12:27:26 $
|
* $Date: 2009-09-02 16:39:32 $
|
||||||
* $Author: secretr $
|
* $Author: e107coders $
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
if (!defined('e107_INIT')) { exit; }
|
if (!defined('e107_INIT')) { exit; }
|
||||||
@@ -1126,7 +1126,11 @@ class e_parse
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Convert text blocks which are to be embedded within JS
|
/**
|
||||||
|
* Convert text blocks which are to be embedded within JS
|
||||||
|
* @param object $stringarray
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
function toJS($stringarray)
|
function toJS($stringarray)
|
||||||
{
|
{
|
||||||
$search = array("\r\n","\r","<br />","'");
|
$search = array("\r\n","\r","<br />","'");
|
||||||
@@ -1141,7 +1145,12 @@ class e_parse
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Convert Text for RSS/XML use.
|
||||||
|
* @param object $text
|
||||||
|
* @param object $tags [optional]
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
function toRss($text,$tags=FALSE)
|
function toRss($text,$tags=FALSE)
|
||||||
{
|
{
|
||||||
if($tags != TRUE)
|
if($tags != TRUE)
|
||||||
@@ -1172,18 +1181,18 @@ class e_parse
|
|||||||
return $text;
|
return $text;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// $nonrelative:
|
/**
|
||||||
// "full" = produce absolute URL path, e.g. http://sitename.com/e107_plugins/etc
|
* Replace e107 path constants
|
||||||
// TRUE = produce truncated URL path, e.g. e107plugins/etc
|
* Note: only an ADMIN user can convert {e_ADMIN}
|
||||||
// "" (default) = URL's get relative path e.g. ../e107_plugins/etc
|
* @param object $text
|
||||||
//
|
* @param object $mode [optional] abs|full "full" = produce absolute URL path, e.g. http://sitename.com/e107_plugins/etc
|
||||||
// $all - if TRUE, then
|
* TRUE = produce truncated URL path, e.g. e107plugins/etc
|
||||||
// when $nonrelative is "full" or TRUE, USERID is also replaced...
|
* "" (default) = URL's get relative path e.g. ../e107_plugins/etc
|
||||||
// when $nonrelative is "" (default), ALL other e107 constants are replaced
|
* @param object $all [optional] if TRUE, then when $mode is "full" or TRUE, USERID is also replaced...
|
||||||
//
|
* when $mode is "" (default), ALL other e107 constants are replaced
|
||||||
// only an ADMIN user can convert {e_ADMIN}
|
* @return
|
||||||
//
|
*/
|
||||||
function replaceConstants($text, $mode = '', $all = false)
|
function replaceConstants($text, $mode = '', $all = false)
|
||||||
{
|
{
|
||||||
if($mode != "")
|
if($mode != "")
|
||||||
|
Reference in New Issue
Block a user