------------------------------------------------------------
revno: 1178
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Wed 2012-04-25 21:30:20 +0200
message:
literal with __() functions
modified:
libs/AikiArray.php
libs/AikiCurl.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'libs/AikiArray.php'
--- libs/AikiArray.php 2012-03-21 03:43:54 +0000
+++ libs/AikiArray.php 2012-04-25 19:30:20 +0000
@@ -136,6 +136,32 @@
return $array;
}
+
+ private function select_type($fieldname, $display=NULL){
+ return '<select name="'. $fieldname.'" >'.
+ (is_null($display) ? "" : '<option value="'.$display.'" selected="selected">'.$display.'</option>').
+ '<option value="textinput" >'. __("Textinput") .'</option>
+ <option value="selection" >'. __("Dynamic Select Menu") .'</option>
+ <option value="staticselect" >'. __("Static Select Menu") .'</option>
+ <option value="unique_textinput" >'. __("Unique Textinput") .'</option>
+ <option value="password" >'. __("Password") .'</option>
+ <option value="textblock" >'. __("Text Block") .'</option>
+ <option value="bigtextblock" >'. __("Big Text Block") .'</option>
+ <option value="hidden" >'. __("Hidden Field") .'</option>
+ <option value="static_input" >'. __("Static Textinput") .'</option>
+ <option value="autofield" >'. __("Auto Filled Field") .'</option>
+ <option value="submit" >'. __("Submit") .'</option>
+ <option value="pkey" >'. __("Primary Key") .'</option>
+ <option value="send_email" >'. __("Send Email") .'</option>
+ <option value="tablename" >'. __("Database Table Name") .'</option>
+ <option value="filemanager" >'. __("File Manager") .'</option>
+ <option value="permission" >'. __("Permissions") .'</option>
+ <option value="events" >'. __("Events") .'</option>
+ <option value="captcha" >'. __("Captcha") .'</option>
+ <option value="edit_type" >'. __("Editing Type") .'</option>
+ </select>';
+ }
+
/**
* This appears to the aiki form editor.
*
@@ -207,29 +233,7 @@
$html_form .= '<div id="'.$y.$arrykeys[$i].'">';
if ( $table == "aiki_forms" ) {
- $html_form .= '<select name="'.$y.$arrykeys[$i]."_type".'" >
- <option value="'.$display.'" selected="selected">'.$display.'</option>
- <option value="textinput" >Textinput</option>
- <option value="selection" >Dynamic Select Menu</option>
- <option value="staticselect" >Static Select Menu</option>
- <option value="unique_textinput" >Unique Textinput</option>
- <option value="password" >Password</option>
- <option value="textblock" >Text Block</option>
- <option value="bigtextblock" >Big Text Block</option>
- <option value="hidden" >Hidden Field</option>
- <option value="static_input" >Static Textinput</option>
- <option value="autofield" >Auto Filled Field</option>
- <option value="submit" >Submit</option>
- <option value="pkey" >Primary Key</option>
- <option value="send_email" >Send Email</option>
- <option value="tablename" >Database Table Name</option>
- <option value="filemanager" >File Manager</option>
- <option value="permission" >Permissions</option>
- <option value="events" >Events</option>
- <option value="captcha" >Captcha</option>
- <option value="edit_type" >Editing Type</option>
- </select>';
-
+ $html_form .= $this->select_type ($y.$arrykeys[$i]."_type", $display);
} else {
$html_form .= "<input type='text' name=\"".
$y.$arrykeys[$i]."_type\" value=\"".
@@ -245,30 +249,9 @@
$newfield = $setting_group->$name;
if ( $table == "aiki_forms" ) {
- $html_form .= '<select name="left_'.$newfield.'" >
- <option value="textinput" >Textinput</option>
- <option value="selection" >Dynamic Select Menu</option>
- <option value="staticselect" >Static Select Menu</option>
- <option value="unique_textinput" >Unique Textinput</option>
- <option value="password" >Password</option>
- <option value="textblock" >Text Block</option>
- <option value="bigtextblock" >Big Text Block</option>
- <option value="hidden" >Hidden Field</option>
- <option value="static_input" >Static Textinput</option>
- <option value="autofield" >Auto Filled Field</option>
- <option value="submit" >Submit</option>
- <option value="pkey" >Primary Key</option>
- <option value="send_email" >Send Email</option>
- <option value="tablename" >Database Table Name</option>
- <option value="filemanager" >File Manager</option>
- <option value="permission" >Permissions</option>
- <option value="events" >Events</option>
- <option value="captcha" >Captcha</option>
- <option value="edit_type" >Editing Type</option>
- </select>';
+ $html_form .= $this->select_type("left_{$newfield}");
} else {
- $html_form .= "<input type='text' name=\"left_".$newfield.
- "\" value=\"\" size='25'>";
+ $html_form .= "<input type='text' name=\"left_{$newfield}\" value=\"\" size='25'>";
}
$html_form .= "<input type='text' name=\"right_".
"$newfield"."\" value=\"\" size='35'>";
=== modified file 'libs/AikiCurl.php'
--- libs/AikiCurl.php 2011-11-08 13:42:45 +0000
+++ libs/AikiCurl.php 2012-04-25 19:30:20 +0000
@@ -28,7 +28,6 @@
* @category Aiki
* @package Library
*
- * @todo rename class AikiCurl
* @todo trace to see if this is used actually, if not, ditch it.
* @todo should actually implement this as a wrapper to curl in my opinion
* @todo should test to see if curl is present and useful in php even
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
