mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

Extra Lans, Notice removal and BC fix for plugin install.

Browse Source
This commit is contained in:
CaMer0n
2009-11-08 13:22:02 +00:00
parent 852204503c
commit 7639c4666c
5 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
e107_admin/ad_links.php
View File

@@ -9,8 +9,8 @@
* Admin Navigation * Admin Navigation
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/ad_links.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/ad_links.php,v $
* $Revision: 1.19 $ * $Revision: 1.20 $
* $Date: 2009-11-07 11:20:25 $ * $Date: 2009-11-08 13:21:56 $
* $Author: e107coders $ * $Author: e107coders $
*/ */
@@ -608,12 +608,15 @@ $array_sub_functions[17][] = array(e_ADMIN.'newspost.php', LAN_MANAGE, ADLAN_3,
$array_sub_functions[17][] = array(e_ADMIN.'newspost.php?create', LAN_CREATE, ADLAN_2, 'H', 3, E_16_CREATE, E_32_CREATE); $array_sub_functions[17][] = array(e_ADMIN.'newspost.php?create', LAN_CREATE, ADLAN_2, 'H', 3, E_16_CREATE, E_32_CREATE);
$array_sub_functions[17][] = array(e_ADMIN.'newspost.php?pref', LAN_PREFS, ADLAN_4, 'H', 3, E_16_SETTINGS, E_32_SETTINGS); $array_sub_functions[17][] = array(e_ADMIN.'newspost.php?pref', LAN_PREFS, ADLAN_4, 'H', 3, E_16_SETTINGS, E_32_SETTINGS);
foreach($array_functions as $val) if(!defset('e_PAGETITLE'))
{ {
$link = str_replace("../","",$val[0]); foreach($array_functions as $val)
if(strpos(e_SELF,$link)!==FALSE)
{ {
define(e_PAGETITLE,$val[1]); $link = str_replace("../","",$val[0]);
if(strpos(e_SELF,$link)!==FALSE)
{
define('e_PAGETITLE',$val[1]);
}
} }
} }

30
e107_admin/image.php
View File

@@ -9,8 +9,8 @@
* Image Administration Area * Image Administration Area
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/image.php,v $
* $Revision: 1.27 $ * $Revision: 1.28 $
* $Date: 2009-11-08 09:14:22 $ * $Date: 2009-11-08 13:21:56 $
* $Author: e107coders $ * $Author: e107coders $
* *
*/ */
@@ -102,16 +102,16 @@ class media_admin_ui extends e_admin_ui
//TODO - finish 'user' type, set 'data' to all editable fields, set 'noedit' for all non-editable fields //TODO - finish 'user' type, set 'data' to all editable fields, set 'noedit' for all non-editable fields
protected $fields = array( protected $fields = array(
'checkboxes' => array('title'=> '', 'type' => null, 'data'=> null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'), 'checkboxes' => array('title'=> '', 'type' => null, 'data'=> null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'),
'media_id' => array('title'=> ID, 'type' => 'int', 'data'=> 'int', 'width' =>'5%', 'forced'=> TRUE), 'media_id' => array('title'=> LAN_ID, 'type' => 'int', 'data'=> 'int', 'width' =>'5%', 'forced'=> TRUE),
'media_preview' => array('title'=> "Preview", 'type' => null, 'data'=> null, 'width' => '10%'), // Generate on the fly. 'media_preview' => array('title'=> "Preview", 'type' => null, 'data'=> null, 'width' => '10%'), // Generate on the fly.
'media_upload' => array('title'=> "Upload File", 'type' => 'upload', 'data'=> null, 'readParm' => 'hidden', 'width' => '10%'), // Generate on the fly. 'media_upload' => array('title'=> "Upload File", 'type' => 'upload', 'data'=> null, 'readParm' => 'hidden', 'width' => '10%'), // Generate on the fly.
'media_title' => array('title'=> "Title", 'type' => 'text', 'data'=> 'str', 'width' => '5%'), 'media_title' => array('title'=> LAN_TITLE, 'type' => 'text', 'data'=> 'str', 'width' => '5%'),
'media_caption' => array('title'=> "Caption", 'type' => 'text', 'data'=> 'str', 'width' => '5%'), 'media_caption' => array('title'=> "Caption", 'type' => 'text', 'data'=> 'str', 'width' => '5%'),
'media_description' => array('title'=> "Description", 'type' => 'textarea', 'data'=> 'str', 'width' => 'auto', 'thclass' => 'left first'), // Display name 'media_description' => array('title'=> LAN_DESCRIPTION, 'type' => 'textarea', 'data'=> 'str', 'width' => 'auto', 'thclass' => 'left first'), // Display name
'media_category' => array('title'=> "Category", 'type' => 'int', 'data'=> 'int', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name 'media_category' => array('title'=> LAN_CATEGORY, 'type' => 'int', 'data'=> 'int', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), // Display name
'media_datestamp' => array('title'=> "datestamp", 'type' => 'datestamp', 'data'=> 'int', 'width' => 'auto'), // User date 'media_datestamp' => array('title'=> LAN_DATESTAMP, 'type' => 'datestamp', 'data'=> 'int', 'width' => 'auto'), // User date
'media_url' => array('title'=> "URL", 'type' => 'url', 'data'=> 'str', 'thclass' => 'center', 'class'=>'center', 'filter' => true, 'batch' => true, 'width' => 'auto'), // Photo 'media_url' => array('title'=> LAN_URL, 'type' => 'url', 'data'=> 'str', 'thclass' => 'center', 'class'=>'center', 'filter' => true, 'batch' => true, 'width' => 'auto'), // Photo
'media_userclass' => array('title'=> "Userclass", 'type' => 'userclass', 'data'=> 'str', 'width' => '10%', 'thclass' => 'center' ), // Real name (no real vetting) 'media_userclass' => array('title'=> LAN_USERCLASS, 'type' => 'userclass', 'data'=> 'str', 'width' => '10%', 'thclass' => 'center' ), // Real name (no real vetting)
'media_tags' => array('title'=> "Tags/Keywords", 'type' => 'text', 'data'=> 'str', 'width' => '10%', 'filter'=>TRUE,'batch'=>TRUE ), // No real vetting 'media_tags' => array('title'=> "Tags/Keywords", 'type' => 'text', 'data'=> 'str', 'width' => '10%', 'filter'=>TRUE,'batch'=>TRUE ), // No real vetting
'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'data'=> null, 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center') 'options' => array('title'=> LAN_OPTIONS, 'type' => null, 'data'=> null, 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center')
); );
@@ -159,17 +159,17 @@ if(isset($_POST['delpref']) || (isset($_POST['delpref_checked']) && isset($_POST
del_pref_val(); del_pref_val();
} }
if($_GET['action'] == "icons") if(varset($_GET['action']) == "icons")
{ {
icon_editor(); icon_editor();
} }
if($_GET['action'] == "avatars") if(varset($_GET['action']) == "avatars")
{ {
show_avatars(); show_avatars();
} }
if($_GET['action'] == 'settings') if(varset($_GET['action']) == 'settings')
{ {
main_config(); main_config();
} }
@@ -464,7 +464,7 @@ function show_avatars()
} }
$ns->tablerender(LAN_IMAGEMANAGER." :: ".IMALAN_18, $mes->render().$text); $ns->tablerender(LAN_MEDIAMANAGER." :: ".IMALAN_18, $mes->render().$text);
} }
/* /*
@@ -773,7 +773,7 @@ if (isset($_POST['check_avatar_sizes']))
</fieldset> </fieldset>
</form>"; </form>";
$ns->tablerender(LAN_IMAGEMANAGER." :: ".IMALAN_7, $mes->render().$text); $ns->tablerender(LAN_MEDIAMANAGER." :: ".IMALAN_7, $mes->render().$text);
} }
//Just in case... //Just in case...
if(!e_AJAX_REQUEST) require_once("footer.php"); if(!e_AJAX_REQUEST) require_once("footer.php");
@@ -863,7 +863,7 @@ function icon_editor()
"; ";
//$text .= "<div style='text-align:center'><a href='".e_SELF."'>".DBLAN_13."</a></div>\n"; //$text .= "<div style='text-align:center'><a href='".e_SELF."'>".DBLAN_13."</a></div>\n";
$ns->tablerender(LAN_IMAGEMANAGER." :: ".IMALAN_71, $mes->render().$text); $ns->tablerender(LAN_MEDIAMANAGER." :: ".IMALAN_71, $mes->render().$text);
return $text; return $text;
} }

15
e107_handlers/form_handler.php
View File

@@ -9,8 +9,8 @@
* Form Handler * Form Handler
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
* $Revision: 1.71 $ * $Revision: 1.72 $
* $Date: 2009-11-08 12:08:24 $ * $Date: 2009-11-08 13:21:56 $
* $Author: e107coders $ * $Author: e107coders $
* *
*/ */
@@ -1407,11 +1407,10 @@ class e_form
foreach ($form['fieldsets'] as $elid => $data) foreach ($form['fieldsets'] as $elid => $data)
{ {
$elid = $form['id'].'-'.$elid; $elid = $form['id'].'-'.$elid;
$text .= " $text .= vartrue($data['fieldset_pre'])."
{$data['fieldset_pre']}
<fieldset id='{$elid}'> <fieldset id='{$elid}'>
<legend>{$data['legend']}</legend> <legend>".vartrue($data['legend'])."</legend>
{$data['table_pre']} ".vartrue($data['table_pre'])."
<table cellpadding='0' cellspacing='0' class='adminedit'> <table cellpadding='0' cellspacing='0' class='adminedit'>
<colgroup span='2'> <colgroup span='2'>
<col class='col-label' /> <col class='col-label' />
@@ -1449,7 +1448,7 @@ class e_form
$text .= " $text .= "
</tbody> </tbody>
</table> </table>
{$data['table_post']} ".vartrue($data['table_post'])."
<div class='buttons-bar center'> <div class='buttons-bar center'>
"; ";
// After submit options // After submit options
@@ -1497,7 +1496,7 @@ class e_form
$text .= " $text .= "
</div> </div>
</fieldset> </fieldset>
{$data['fieldset_post']} ".vartrue($data['fieldset_post'])."
"; ";
} }
$text .= " $text .= "

5
e107_handlers/plugin_class.php
View File

@@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
| $Revision: 1.113 $ | $Revision: 1.114 $
| $Date: 2009-11-07 02:28:54 $ | $Date: 2009-11-08 13:21:56 $
| $Author: e107coders $ | $Author: e107coders $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@@ -1603,6 +1603,7 @@ class e107plugin
$function = 'install'; $function = 'install';
$sql = e107::getDb(); $sql = e107::getDb();
$mes = e107::getMessage(); $mes = e107::getMessage();
$mySQLprefix = MPREFIX; // Fix for some plugin.php files.
$plug = $this->getinfo($id); $plug = $this->getinfo($id);
$_path = e_PLUGIN.$plug['plugin_path'].'/'; $_path = e_PLUGIN.$plug['plugin_path'].'/';

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

@@ -1,7 +1,7 @@
<?php <?php
/* /*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt) * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id: lan_admin.php,v 1.36 2009-11-08 12:08:35 e107coders Exp $ * $Id: lan_admin.php,v 1.37 2009-11-08 13:22:02 e107coders Exp $
* *
* Admin Language File * Admin Language File
*/ */
@@ -310,5 +310,9 @@ define("LAN_STATUS", "Status");
define("LAN_URL", "URL"); define("LAN_URL", "URL");
define("LAN_USER", "User"); define("LAN_USER", "User");
define("LAN_ID", "ID"); define("LAN_ID", "ID");
define("LAN_TITLE", "Title");
define("LAN_DESCRIPTION", "Description");