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

Issue #6: Remove and optimize (hardcoded) LANS

Browse Source
This commit is contained in:
Lóna Lore
2015-05-02 09:55:47 +02:00
parent e809a4f3aa
commit 4b3062d0fa
5 changed files with 134 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/cron.php
View File

@@ -442,7 +442,8 @@ class cron_admin_ui extends e_admin_ui
$obj = new $class_name; $obj = new $class_name;
if (method_exists($obj, $method_name)) if (method_exists($obj, $method_name))
{ {
$mes->add("Executing config function <b>".$class_name." : ".$method_name."()</b>", E_MESSAGE_DEBUG); $message = str_replace('[function]', $class_name." : ".$method_name, LAN_CRON_55);
$mes->add($message, E_MESSAGE_DEBUG);
if ($return == 'boolean') if ($return == 'boolean')
{ {
call_user_func(array($obj, $method_name)); call_user_func(array($obj, $method_name));
@@ -455,7 +456,8 @@ class cron_admin_ui extends e_admin_ui
} }
else else
{ {
$mes->add("Config function <b>".$method_name."()</b> NOT found.", E_MESSAGE_DEBUG); $message = str_replace('[method]', $method_name."()", LAN_CRON_56);
$mes->add($message, E_MESSAGE_DEBUG);
} }
} }
return FALSE; return FALSE;

134
e107_admin/db.php
View File

@@ -104,15 +104,15 @@ if(e_AJAX_REQUEST )
$zip = e107::getFile()->zip($data, e_BACKUP.$newFile.".zip"); $zip = e107::getFile()->zip($data, e_BACKUP.$newFile.".zip");
echo "File backup complete! <small>(".$zip.")</small><br />"; echo DBLAN_60." <small>(".$zip.")</small><br />";
echo "Starting database backup...<br />"; echo DBLAN_61."<br />";
$dbfile = e107::getDb()->backup('*', $newFile.".sql", array('nologs'=>1, 'droptable'=>1)); $dbfile = e107::getDb()->backup('*', $newFile.".sql", array('nologs'=>1, 'droptable'=>1));
echo "Database backup complete! <small>(".$dbfile.")</small>"; echo DBLAN_62." <small>(".$dbfile.")</small>";
e107::getAdminLog()->addSuccess($zip." ".$dbfile, false)->save('Full site backup completed.'); e107::getAdminLog()->addSuccess($zip." ".$dbfile, false)->save(DBLAN_63);
} }
@@ -175,9 +175,9 @@ class system_tools
'importForm' => array('diz'=>DBLAN_59, 'label'=> DBLAN_59), 'importForm' => array('diz'=>DBLAN_59, 'label'=> DBLAN_59),
'exportForm' => array('diz'=>DBLAN_58, 'label'=> DBLAN_58), 'exportForm' => array('diz'=>DBLAN_58, 'label'=> DBLAN_58),
'sc_override_scan' => array('diz'=>DBLAN_55, 'label'=> DBLAN_56), 'sc_override_scan' => array('diz'=>DBLAN_55, 'label'=> DBLAN_56),
'convert_to_utf8' => array('diz'=>'Check Database Charset','label'=>'Check Charset'), 'convert_to_utf8' => array('diz'=>DBLAN_64,'label'=>DBLAN_65),
'correct_perms' => array('diz'=>'Correct File and Directory permissions','label'=>'Correct Perms'), 'correct_perms' => array('diz'=>DBLAN_66,'label'=>DBLAN_67),
'backup' => array('diz'=>'Backup Database, Files and Folders','label'=>'Backup Site') 'backup' => array('diz'=>DBLAN_68,'label'=>DBLAN_69)
); );
if(vartrue($_SERVER['E_DEV'])) if(vartrue($_SERVER['E_DEV']))
@@ -307,8 +307,8 @@ class system_tools
$mes = e107::getMessage(); $mes = e107::getMessage();
$message = "This will create a database dump and a zipped backup of all non-core plugins, your site theme, your media files and system logs"; $message = DBLAN_70;
$message .= "<br /><a class='e-ajax btn btn-success' data-loading-text='Please wait...' href='#backupstatus' data-src='".e_SELF."?mode=backup' >".LAN_CREATE."</a>"; $message .= "<br /><a class='e-ajax btn btn-success' data-loading-text='".DBLAN_71."' href='#backupstatus' data-src='".e_SELF."?mode=backup' >".LAN_CREATE."</a>";
$mes->addInfo($message); $mes->addInfo($message);
@@ -339,10 +339,10 @@ class system_tools
} }
else else
{ {
$mes->addSuccess("Folder and File permissions have been updated"); $mes->addSuccess(DBLAN_72);
} }
e107::getRender()->tablerender(DBLAN_10.SEP."Correcting File and Directory Permissions", $mes->render()); e107::getRender()->tablerender(DBLAN_10.SEP.DBLAN_73, $mes->render());
} }
@@ -359,14 +359,14 @@ class system_tools
if($connect = $sql->connect($server,$user, $pass, true)) if($connect = $sql->connect($server,$user, $pass, true))
{ {
$mes->addSuccess("Connecting to server"); $mes->addSuccess(DBLAN_74);
if(vartrue($_POST['createdb'])) if(vartrue($_POST['createdb']))
{ {
if($sql->gen("CREATE DATABASE ".$database." CHARACTER SET `utf8`")) if($sql->gen("CREATE DATABASE ".$database." CHARACTER SET `utf8`"))
{ {
$mes->addSuccess("Creating Database"); $mes->addSuccess(DBLAN_75);
// $sql->gen("CREATE USER ".$user."@'".$server."' IDENTIFIED BY '".$pass."';"); // $sql->gen("CREATE USER ".$user."@'".$server."' IDENTIFIED BY '".$pass."';");
$sql->gen("GRANT ALL ON `".$database."`.* TO ".$user."@'".$server."';"); $sql->gen("GRANT ALL ON `".$database."`.* TO ".$user."@'".$server."';");
@@ -374,17 +374,17 @@ class system_tools
} }
else else
{ {
$mes->addError("Creating Database"); $mes->addError(DBLAN_75);
return; return;
} }
} }
if(!$sql->database($database)) if(!$sql->database($database))
{ {
$mes->addError("Selecting database"); $mes->addError(DBLAN_76);
} }
$mes->addSuccess("Selecting database"); $mes->addSuccess(DBLAN_76);
if($this->multiSiteCreateTables($sql, $prefix)) if($this->multiSiteCreateTables($sql, $prefix))
{ {
@@ -396,7 +396,7 @@ class system_tools
} }
else else
{ {
$mes->addSuccess("Connecting to server"); $mes->addSuccess(DBLAN_74);
} }
if($error = $sql->getLastErrorText()) if($error = $sql->getLastErrorText())
@@ -418,7 +418,7 @@ class system_tools
if (!$sql_data) if (!$sql_data)
{ {
$mes->addError("Couldn't read core sql file"); $mes->addError(DBLAN_77);
} }
preg_match_all("/create(.*?)(?:myisam|innodb);/si", $sql_data, $result ); preg_match_all("/create(.*?)(?:myisam|innodb);/si", $sql_data, $result );
@@ -455,16 +455,17 @@ class system_tools
if(!isset($POST['create_multisite'])) if(!isset($POST['create_multisite']))
{ {
$mes->addInfo("This will create a fresh installation of e107 at the domain you specify. Using your server administration software (eg. cPanel) - park your other domain on top of ".e_DOMAIN); $info = str_replace('[domain]', e_DOMAIN, LANINS_133);
$mes->addInfo($info);
} }
$text = $frm->open('multisite')." $text = $frm->open('multisite')."
<table class='table table-striped' > <table class='table table-striped' >
<tr> <tr>
<td><label for='server'>Parked Domain</label></td> <td><label for='server'>".LANINS_130."</label></td>
<td> <td>
<input class='tbox' type='text' placeholder='mydomain.com' id='domain' name='domain' autofocus size='40' value='' maxlength='100' required='required' /> <input class='tbox' type='text' placeholder='".LANINS_132."' id='domain' name='domain' autofocus size='40' value='' maxlength='100' required='required' />
<span class='field-help'>The parked domain which will become a new e107 website.</span> <span class='field-help'>".LANINS_131."</span>
</td> </td>
</tr> </tr>
"; ";
@@ -597,10 +598,10 @@ class system_tools
<thead> <thead>
<tr> <tr>
<th>Table</th> <th>".DBLAN_78."</th>
<th>Engine</th> <th>".DBLAN_79."</th>
<th>Collation</th> <th>".DBLAN_80."</th>
<th>Status</th> <th>".DBLAN_81."</th>
</tr> </tr>
</thead> </thead>
<tbody>"; <tbody>";
@@ -636,29 +637,27 @@ class system_tools
if($invalidCollations == true) if($invalidCollations == true)
{ {
//TODO LAN $message = str_replace('[database]', $config['mySQLdefaultdb'], DBLAN_82);
$message = ' $message .= '<br/>';
This function will permanently modify all tables in your database. ('.$config['mySQLdefaultdb'].')<br /> $message .= DBLAN_83;
It is <b>HIGHLY</b> recommended that you first backup your database and switch your site into maintenance mode. $message .= '<br/>';
<br /> $message .= '<br/>';
<br /> $message .= DBLAN_84;
Please note: $message .= '<ul>';
<ul> $message .= '<li>'.DBLAN_85.'</li>';
<li>The conversion process can take up to one minute or much much more depending on the size of your database.</li> $message .= '<li>'.DBLAN_86.'</li>';
<li>The conversion does not work with serialized arrays.</li> $message .= '<li>'.DBLAN_87.'</li>';
<li>Be sure that you have followed all steps of the upgrade process first.</li> $message .= '<li>'.DBLAN_88.'</li>';
<li>Core prefs are ignored during the conversion process due to possibility of corruption. </li> $message .= '</ul>';
</ul>
';
$mes->add($message, E_MESSAGE_WARNING); $mes->add($message, E_MESSAGE_WARNING);
$text .= " $text .= "
<form method='post' action='".e_SELF."' id='linkform'> <form method='post' action='".e_SELF."' id='linkform'>
<fieldset id='core-db-utf8-convert'> <fieldset id='core-db-utf8-convert'>
<legend class='e-hideme'>"."Convert Database"."</legend> <legend class='e-hideme'>".DBLAN_89."</legend>
<div class='buttons-bar center'> <div class='buttons-bar center'>
".$frm->admin_button('perform_utf8_convert', "Convert non-UTF8 Tables",false,"Convert non-UTF8 Tables",'class=btn-success&data-loading-text=Please wait...')." ".$frm->admin_button('perform_utf8_convert', DBLAN_90,false,DBLAN_90,'class=btn-success&data-loading-text='.DBLAN_91)."
</div> </div>
</fieldset> </fieldset>
</form>"; </form>";
@@ -666,7 +665,7 @@ class system_tools
} }
else else
{ {
$mes->addSuccess("Your tables are using the correct character set."); $mes->addSuccess(DBLAN_92);
} }
@@ -788,11 +787,11 @@ class system_tools
} }
elseif($ERROR != TRUE) elseif($ERROR != TRUE)
{ {
$message = "Database Converted successfully to UTF-8. "; $message = DBLAN_93;
//$message .= "<br />Please now add the following line to your e107_config.php file:<br /><b>\$mySQLcharset = 'utf8';</b>"; //$message .= "<br />Please now add the following line to your e107_config.php file:<br /><b>\$mySQLcharset = 'utf8';</b>";
$mes->add($message, E_MESSAGE_SUCCESS); $mes->add($message, E_MESSAGE_SUCCESS);
$mes->addSuccess("Please make sure you have the following line in your e107_config.php file:"); $mes->addSuccess(DBLAN_94);
$mes->addSuccess('$mySQLcharset = "utf8";'); $mes->addSuccess('$mySQLcharset = "utf8";');
} }
@@ -1004,12 +1003,9 @@ class system_tools
$mes = e107::getMessage(); $mes = e107::getMessage();
$frm = e107::getSingleton('e_form'); $frm = e107::getSingleton('e_form');
//TODO LANs
$text = "<form method='post' action='".e_SELF."?".e_QUERY."' id='core-db-export-form'> $text = "<form method='post' action='".e_SELF."?".e_QUERY."' id='core-db-export-form'>
<fieldset id='core-db-export'> <fieldset id='core-db-export'>
<legend class='e-hideme'>Export Options</legend> <legend class='e-hideme'>".DBLAN_95."</legend>
<table class='table adminlist'> <table class='table adminlist'>
<colgroup> <colgroup>
<col style='width: 80%' /> <col style='width: 80%' />
@@ -1017,8 +1013,8 @@ class system_tools
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th>".$frm->checkbox_toggle('check-all-verify', 'xml_prefs')." Preferences</th> <th>".$frm->checkbox_toggle('check-all-verify', 'xml_prefs')." ".DBLAN_96."</th>
<th class='right'>Rows</th> <th class='right'>".DBLAN_98."</th>
</tr> </tr>
</thead> </thead>
@@ -1053,8 +1049,8 @@ class system_tools
</colgroup> </colgroup>
<thead> <thead>
<tr> <tr>
<th>".$frm->checkbox_toggle('check-all-verify', 'xml_tables')."Tables</th> <th>".$frm->checkbox_toggle('check-all-verify', 'xml_tables').DBLAN_97."</th>
<th class='right'>Rows</th> <th class='right'>".DBLAN_98."</th>
</tr> </tr>
</thead> </thead>
@@ -1067,7 +1063,7 @@ class system_tools
$checked = (vartrue($_POST['xml_tables'][$name]) == $name) ? 1: 0; $checked = (vartrue($_POST['xml_tables'][$name]) == $name) ? 1: 0;
$text .= "<tr> $text .= "<tr>
<td> <td>
".$frm->checkbox("xml_tables[".$name."]", $name, $checked, array('label'=>"Table Data: ".$name)). ".$frm->checkbox("xml_tables[".$name."]", $name, $checked, array('label'=>DBLAN_99." ".$name)).
"</td> "</td>
<td class='right'>$count</td> <td class='right'>$count</td>
</tr>"; </tr>";
@@ -1092,7 +1088,7 @@ class system_tools
<tr> <tr>
<td colspan='2'>"; <td colspan='2'>";
$checked = (vartrue($_POST['package_images'])) ? 1: 0; $checked = (vartrue($_POST['package_images'])) ? 1: 0;
$text .= $frm->checkbox("package_images",'package_images', $checked)." Convert paths and package images and xml into: <i>".e107::getParser()->replaceConstants(EXPORT_PATH)."</i> $text .= $frm->checkbox("package_images",'package_images', $checked)." ".DBLAN_100." <i>".e107::getParser()->replaceConstants(EXPORT_PATH)."</i>
</td> </td>
</tr> </tr>
@@ -1100,13 +1096,13 @@ class system_tools
</table> </table>
<div class='buttons-bar center'> <div class='buttons-bar center'>
".$frm->admin_button('exportXmlFile', "Export File", 'other')." ".$frm->admin_button('exportXmlFile', DBLAN_101, 'other')."
</div> </div>
</fieldset> </fieldset>
</form> "; </form> ";
e107::getRender()->tablerender(DBLAN_10.SEP."Export Options",$mes->render(). $text); e107::getRender()->tablerender(DBLAN_10.SEP.DBLAN_102,$mes->render(). $text);
} }
@@ -1121,12 +1117,12 @@ class system_tools
foreach($ret['success'] as $table) foreach($ret['success'] as $table)
{ {
e107::getMessage()->addSuccess("Inserted $table"); e107::getMessage()->addSuccess(DBLAN_103." $table");
} }
foreach($ret['failed'] as $table) foreach($ret['failed'] as $table)
{ {
e107::getMessage()->addError("Failed to Insert $table"); e107::getMessage()->addError(DBLAN_104." $table");
} }
} }
@@ -1279,12 +1275,11 @@ class system_tools
//$pref['sc_override'] = $scList; //$pref['sc_override'] = $scList;
//save_prefs(); //save_prefs();
// $mes->add(DBLAN_57.':<br />'.$pref['sc_override'], E_MESSAGE_SUCCESS); // $mes->add(DBLAN_57.':<br />'.$pref['sc_override'], E_MESSAGE_SUCCESS);
// FIXME lan
e107::getRender()->tablerender( e107::getRender()->tablerender(
'<strong>'.DBLAN_56, DBLAN_57.':</strong> ' '<strong>'.DBLAN_56, DBLAN_57.':</strong> '
.($config->get('sc_override') ? '<br />'.$config->get('sc_override') : '(empty)') .($config->get('sc_override') ? '<br />'.$config->get('sc_override') : DBLAN_106)
.'<br /><br /><strong>Batch shortcodes:</strong>' .'<br /><br /><strong>'.DBLAN_105.'</strong>'
.($config->get('sc_batch_override') ? '<br />'.$config->get('sc_batch_override') : '(empty)') .($config->get('sc_batch_override') ? '<br />'.$config->get('sc_batch_override') : DBLAN_106)
); );
} }
@@ -1457,8 +1452,6 @@ function exportXmlFile($prefs,$tables,$package=FALSE,$debug=FALSE)
$tp = e107::getParser(); $tp = e107::getParser();
$mes = e107::getMessage(); $mes = e107::getMessage();
//TODO LANs
if(vartrue($package)) if(vartrue($package))
{ {
@@ -1473,7 +1466,8 @@ function exportXmlFile($prefs,$tables,$package=FALSE,$debug=FALSE)
if(!is_writable($desinationFolder)) if(!is_writable($desinationFolder))
{ {
$mes->add($desinationFolder." is not writable", E_MESSAGE_ERROR); $message = str_replace('[folder]', $desinationFolder, DBLAN_107);
$mes->add($message, E_MESSAGE_ERROR);
return ; return ;
} }
} }
@@ -1481,7 +1475,7 @@ function exportXmlFile($prefs,$tables,$package=FALSE,$debug=FALSE)
if($xml->e107Export($prefs,$tables,$debug)) if($xml->e107Export($prefs,$tables,$debug))
{ {
$mes->add("Created: ".$desinationFolder."install.xml", E_MESSAGE_SUCCESS); $mes->add(DBLAN_108." ".$desinationFolder."install.xml", E_MESSAGE_SUCCESS);
if(varset($xml->fileConvertLog)) if(varset($xml->fileConvertLog))
{ {
foreach($xml->fileConvertLog as $oldfile) foreach($xml->fileConvertLog as $oldfile)
@@ -1490,11 +1484,11 @@ function exportXmlFile($prefs,$tables,$package=FALSE,$debug=FALSE)
$newfile = $desinationFolder.$file; $newfile = $desinationFolder.$file;
if($oldfile == $newfile || (copy($oldfile,$newfile))) if($oldfile == $newfile || (copy($oldfile,$newfile)))
{ {
$mes->add("Copied: ".$newfile, E_MESSAGE_SUCCESS); $mes->add(DBLAN_109." ".$newfile, E_MESSAGE_SUCCESS);
} }
else else
{ {
$mes->add("Couldn't copy: ".$newfile, E_MESSAGE_ERROR); $mes->add(DBLAN_110." ".$newfile, E_MESSAGE_ERROR);
} }
} }
} }

2
e107_languages/English/admin/lan_cron.php
View File

@@ -88,6 +88,8 @@ define("LAN_CRON_52", "Day(s):");
define("LAN_CRON_53", "Month(s):"); define("LAN_CRON_53", "Month(s):");
define("LAN_CRON_54", "Weekday(s):"); define("LAN_CRON_54", "Weekday(s):");
define("LAN_CRON_55", "Executing config function [b][function][/b]");
define("LAN_CRON_56", "Config function [b][method][/b] NOT found.");
define("LAN_CRON_BACKUP", "Backup"); define("LAN_CRON_BACKUP", "Backup");
define("LAN_CRON_LOGGING", "Logging"); define("LAN_CRON_LOGGING", "Logging");

59
e107_languages/English/admin/lan_db.php
View File

@@ -70,4 +70,63 @@ define('DBLAN_57', 'Shortcode Override list set to');
define('DBLAN_58', "Export Site Data"); define('DBLAN_58', "Export Site Data");
define('DBLAN_59', "Import Site Data"); define('DBLAN_59', "Import Site Data");
define('DBLAN_60', "File backup complete!");
define('DBLAN_61', "Starting database backup...");
define('DBLAN_62', "Database backup complete!");
define('DBLAN_63', "Full site backup completed.");
define('DBLAN_64', "Check Database Charset");
define('DBLAN_65', "Check Charset");
define('DBLAN_66', "Correct File and Directory permissions");
define('DBLAN_67', "Correct Perms");
define('DBLAN_68', "Backup Database, Files and Folders");
define('DBLAN_69', "Backup Site");
define('DBLAN_70', "This will create a database dump and a zipped backup of all non-core plugins, your site theme, your media files and system logs");
define('DBLAN_71', "Please wait...");
define('DBLAN_72', "Folder and File permissions have been updated");
define('DBLAN_73', "Correcting File and Directory Permissions");
define('DBLAN_74', "Connecting to server");
define('DBLAN_75', "Creating Database");
define('DBLAN_76', "Selecting database");
define('DBLAN_77', "Couldn't read core sql file");
define('DBLAN_78', "Table");
define('DBLAN_79', "Engine");
define('DBLAN_80', "Collation");
define('DBLAN_81', "Status");
define('DBLAN_82', "This function will permanently modify all tables in your database. ([database])");
define('DBLAN_83', "It is [b]HIGHLY[/b] recommended that you first backup your database and switch your site into maintenance mode.");
define('DBLAN_84', "Please note:");
define('DBLAN_85', "The conversion process can take up to one minute or much much more depending on the size of your database.");
define('DBLAN_86', "The conversion does not work with serialized arrays.");
define('DBLAN_87', "Be sure that you have followed all steps of the upgrade process first.");
define('DBLAN_88', "Core prefs are ignored during the conversion process due to possibility of corruption.");
define('DBLAN_89', "Convert Database");
define('DBLAN_90', "Convert non-UTF8 Tables");
define('DBLAN_91', "Please wait...");
define('DBLAN_92', "Your tables are using the correct character set.");
define('DBLAN_93', "Database Converted successfully to UTF-8.");
define('DBLAN_94', "Please make sure you have the following line in your e107_config.php file:");
define('DBLAN_95', "Export Options");
define('DBLAN_96', "Preferences");
define('DBLAN_97', "Tables");
define('DBLAN_98', "Rows");
define('DBLAN_99', "Table Data:");
define('DBLAN_100', "Convert paths and package images and xml into:");
define('DBLAN_101', "Export File");
define('DBLAN_102', "Export Options");
define('DBLAN_103', "Inserted");
define('DBLAN_104', "Failed to Insert");
define('DBLAN_105', "Batch shortcodes:");
define('DBLAN_106', "(empty)");
define('DBLAN_107', "[folder] is not writable");
define('DBLAN_108', "Created:");
define('DBLAN_109', "Copied:");
define('DBLAN_110', "Couldn't copy:");
?> ?>

6
e107_languages/English/lan_installer.php
View File

@@ -185,4 +185,8 @@ define("LANINS_126", "For security reasons you should now set the file permissio
define("LANINS_127", "The database [x] already exists. Overwrite it? (any existing data will be lost)"); define("LANINS_127", "The database [x] already exists. Overwrite it? (any existing data will be lost)");
define("LANINS_128", "Overwrite"); define("LANINS_128", "Overwrite");
define("LANINS_129", "Database not found."); define("LANINS_129", "Database not found.");
define('LANINS_130', "Parked Domain");
define('LANINS_131', "The parked domain which will become a new e107 website.");
define('LANINS_132', "mydomain.com");
define('LANINS_133', "This will create a fresh installation of e107 at the domain you specify. Using your server administration software (eg. cPanel) - park your other domain on top of [domain]");